Index: /applications/editors/josm/i18n/po/ar.po =================================================================== --- /applications/editors/josm/i18n/po/ar.po (revision 18974) +++ /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 "" #~ "صفحة المساعدة مفقودة. إنشائها بِــ الإنكليزية أو \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\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" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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 "Разширения" @@ -312,4 +307,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 @@ -317,8 +314,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 @@ -328,29 +325,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 @@ -379,6 +374,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 "" "Няма слоеве към които слоя източник
''{0}''.
би могъл да се " @@ -432,14 +427,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 "Географска дължина:" @@ -465,10 +460,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 @@ -499,19 +494,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 @@ -520,9 +518,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 @@ -538,7 +533,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 @@ -550,11 +545,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" @@ -642,5 +637,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}" @@ -695,10 +690,10 @@ "последователност от възли)." -#: ../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 "Моля, изберете поне две линии за комбиниране." @@ -717,19 +712,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 " @@ -740,9 +735,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 @@ -815,21 +810,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" @@ -837,6 +836,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 @@ -865,5 +864,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 "Дублиране" @@ -921,8 +920,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 @@ -930,5 +927,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 @@ -941,8 +938,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 @@ -961,8 +958,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 @@ -985,13 +982,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 @@ -1031,4 +1029,106 @@ msgstr "Показва информация за OSM точки, пътища или връзки." +#: ../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 "\"{0}\" не е затворен и съответно не може да бъде съединен." + +#: ../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 "" +"Избрания път(ища) имат възли извън района на свалените данни.\n" +"Това може да доведе до нежелано изтриване на възли, свързани с други " +"пътища.\n" +"Сигурни ли сте че искате да продължите?" + +#: ../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 @@ -1048,4 +1148,46 @@ 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 "Можете също да поставите препратка URL от www.openstreetmap.org" + +#: ../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 "URL" + +#: ../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" @@ -1056,26 +1198,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 "" @@ -1083,5 +1225,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" @@ -1460,6 +1602,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 "" "Показва отчет на статуса с полезна информация, която може да бъде свързана с " @@ -1481,9 +1622,43 @@ #: ../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] "" +"Селекцията се състои от {0} път. Сигурни ли сте че искате да го опростите?" +msgstr[1] "" +"Селекцията се състои от {0} пътя. Сигурни ли сте че искате да ги опростите?" + +#: ../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] "Опростяване на път (премахната {0} точка)" +msgstr[1] "Опростяване на път (премахнати {0} точки)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1550,6 +1725,6 @@ "should verify this and correct it when necessary." msgstr "" -"Ролевото членство в релация беше копирано за всички нови " -"пътища.
Трябва да го проверите и коригирате ако е необходимо." +"Ролевото членство в релация беше копирано за всички нови пътища." +"
Трябва да го проверите и коригирате ако е необходимо." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 @@ -1618,6 +1793,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 "" "* Една точка, която се използва от няколко линии и една от тези линии, или" @@ -1700,54 +1874,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 "" @@ -1755,38 +1929,38 @@ "resolve them first." msgstr "" -"Има неразрешени конфликти в слой ''{0}''.
Трябва да ги " -"разрешите." - -#: ../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 +"Има неразрешени конфликти в слой ''{0}''.
Трябва да ги разрешите." + +#: ../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 "Синхронизиране само на възел {0}" -#: ../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 "Синхронизиране само на пътя {0}" -#: ../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 "Синхронизиране само на релацията {0}" -#: ../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 "" @@ -1794,9 +1968,8 @@ "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.
" +"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 "" "Качването се провали понеже на сървъра има по-нова " @@ -1804,31 +1977,30 @@ "конфликта се явява {0} с id {1},
версия " "на сървъра {2}, а ваша версия {3}.

Натиснете {4} за " -"да синхронизирате само конфликтните примитиви.
Натиснете " -"{5} за да синхронизирате целия локален набор данни с " -"сървъра.
Натиснете {6} за да прекратите и продължите " +"да синхронизирате само конфликтните примитиви.
Натиснете {5} за да синхронизирате целия локален набор данни с сървъра." +"
Натиснете {6} за да прекратите и продължите " "редактирането.
" -#: ../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 +#: ../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.
" +"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 "" "Качването неуспешно защото сървърът има по-нова " "версия
на някой от вашите възли, пътища, или отношения.

Кликнете " -"{0} за да синхронизирате цялата база данни със " -"сървъра.
Кликнете {1} за отказ и продължаване на " -"редакциите.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 +"{0} за да синхронизирате цялата база данни със сървъра." +"
Кликнете {1} за отказ и продължаване на редакциите." +"
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1838,22 +2010,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 "" @@ -1864,15 +2036,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 "Обновяване на примитива." @@ -1884,6 +2056,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 "" @@ -1892,38 +2064,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 "" @@ -2088,6 +2259,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 "" @@ -2157,38 +2328,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." @@ -2197,14 +2368,14 @@ msgstr[1] "Вмъкване на нов възел в {0} пътя." -#: ../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 "Завършване на чертането." @@ -2240,6 +2411,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 "" "Влачете позицията на просвирване и пуснете близо до следата за да " @@ -2344,5 +2515,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." @@ -2420,6 +2591,5 @@ msgid "" "type: - type of the object (node, way, relation)" -msgstr "" -"тип: - тип на обекта (възел, път, връзка)" +msgstr "тип: - тип на обекта (възел, път, връзка)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 @@ -2428,12 +2598,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - всички обекти, променени от зададения потребител" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - обект с дадено ID (0 за нови обекти)" -#: ../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 "nodes:... - обекти с дадено количество възели / точки" -#: ../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-" @@ -2441,21 +2616,21 @@ 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 "modified - всички променени обекти" -#: ../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 "selected - всички избрани обекти" -#: ../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 "incomplete - всички непълни обекти" -#: ../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 "untagged - всички немаркирани обекти" -#: ../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" @@ -2463,5 +2638,5 @@ "child израз - всички обекти наследници, отговарящи на израза" -#: ../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" @@ -2469,10 +2644,9 @@ "parent израз - всички родители на обектите отговарящи на израза" -#: ../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 "" -"Използвайте | или OR за да обедините в логическо \"ИЛИ\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +msgstr "Използвайте | или OR за да обедините в логическо \"ИЛИ\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2480,9 +2654,9 @@ "ключ съдържа двоеточие)" -#: ../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 @@ -2492,56 +2666,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 "Нищо не е добавено към селекцията в резултат на търсенето за ''{0}''" -#: ../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 "" -"Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 +msgstr "Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''" + +#: ../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 "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2555,5 +2728,5 @@ "{2}" -#: ../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 "" @@ -2561,10 +2734,10 @@ "ключ=стойност." -#: ../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 "Синтактична грешка: Шаблонът {0} в {1} е недопустим!" -#: ../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" @@ -2573,26 +2746,26 @@ "връзка." -#: ../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 "Неочакван знак: {0}" -#: ../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 "" @@ -2601,9 +2774,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 "" @@ -2614,5 +2787,5 @@ "числова стойност, възел или диапазон, например, 10-20" -#: ../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." @@ -2663,8 +2836,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" +#, fuzzy, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" msgstr "" "Предупреждение: автоматически е премахнат етикета ''{0}'' на изтрития " @@ -2672,7 +2844,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2812,5 +2984,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 "Двоен конфликт" @@ -2829,5 +3001,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 "" @@ -2847,19 +3020,19 @@ "невъзможно е разрешаването на конфликт, за който няма предложено решение." +#: ../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" @@ -2868,5 +3041,5 @@ msgstr[1] "Изтриване на {0} обекта" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2875,5 +3048,5 @@ msgstr[1] "Изтриване на {0} възела" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2882,5 +3055,5 @@ msgstr[1] "Изтриване на {0} пътя" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2891,10 +3064,10 @@ #. 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?" +#: ../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 "" "Вие се каните да изтриете възли, намиращи се извън зоната, която сте свалили " @@ -2902,5 +3075,5 @@ "не виждате) може да ги използват.
Наистина ли искате да ги триете?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "Потвърждение за изтриване" @@ -2918,15 +3091,15 @@ msgstr[1] "Преместване {0} възела" -#: ../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 "Обектът ''{0}'' е изтрит" -#: ../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 "Изтрити {0} обекта" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154 #, java-format msgid "" @@ -2937,5 +3110,5 @@ "стойност - {1}" -#: ../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}" @@ -2946,11 +3119,4 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Разрешаване на конфликтите в списъка с членове на връзката {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "" -"Невъзможно е връщането на командата ''{0}'', защото слой ''{1}'' не е " -"наличен вече" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3029,5 +3195,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 " @@ -3178,6 +3344,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 "" @@ -3262,5 +3428,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3269,5 +3435,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3275,25 +3441,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 @@ -3316,25 +3482,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}" @@ -3342,6 +3509,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 "" @@ -3404,24 +3571,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 "Очакваше се ID >= 0. Имаме: {0}." -#: ../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 "Примитив с ID = 0 не може да бъде невидим." -#: ../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 "Очаква се ID > 0. Имаме {0}." -#: ../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 "Очакваше се Version > 0. Имаме: {0}." -#: ../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 " @@ -3429,5 +3596,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 "" @@ -3459,6 +3626,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}." @@ -3479,5 +3646,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 @@ -3489,6 +3655,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 "" @@ -3499,135 +3664,135 @@ msgstr "параметърът {0} не е в интервала 0..{1}, той е {2}" -#: ../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:640 +#: ../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:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 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 "Стил за ограничение {0} не е намерен." -#: ../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 "Пресичане между пътища ''{0}'' и ''{1}''." -#: ../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 "Няма подходяща роля ''{0}'' за Път ''{1}''." -#: ../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 "Не-Път ''{0}'' в мултиполигон." -#: ../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 "Липсва външен път за мултиполигон ''{0}''." -#: ../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 "Стилът за вътрешния път ''{0}'' се равнява на мултиполигон." -#: ../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 "Стилът за външния път ''{0}'' се разминава." -#: ../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}" @@ -3639,5 +3804,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 @@ -3656,5 +3821,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 @@ -3674,5 +3839,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 "фон" @@ -3790,9 +3955,8 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 #, java-format -msgid "" -"Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "" -"Невъзможно прочитането на отметките от
''{0}''
Грешката е: " -"{1}" +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" +"Невъзможно прочитането на отметките от
''{0}''
Грешката е: {1}" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78 @@ -3806,5 +3970,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 @@ -3812,32 +3976,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" @@ -3846,5 +4010,5 @@ msgstr[1] "{0} точки" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -3939,6 +4103,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "" -"Променете размера на аплета до зададения (формат: ШИРОЧИНА x ВИСОЧИНА)" +msgstr "Променете размера на аплета до зададения (формат: ШИРОЧИНА x ВИСОЧИНА)" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 @@ -4094,12 +4257,12 @@ msgstr "Настройката {0} беше премахната тъй като вече не се използва." -#: ../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 @@ -4113,19 +4276,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 @@ -4136,5 +4299,5 @@ msgstr "Меню: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Аудио" @@ -4178,29 +4341,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 " @@ -4208,9 +4371,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 "Потребител:" @@ -4246,6 +4409,5 @@ #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101 msgid "unset: do not set this property on the selected objects" -msgstr "" -"unset: не променяйте стойността на този параметър на избраните обекти" +msgstr "unset: не променяйте стойността на този параметър на избраните обекти" #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95 @@ -4318,5 +4480,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" @@ -4325,5 +4487,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" @@ -4332,5 +4494,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" @@ -4349,5 +4511,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 @@ -4364,5 +4526,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" @@ -4434,22 +4596,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 "списъкът в роля {0} понастоящем не участва в двойка за сравнение" -#: ../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 "неочаквана стойност на параметъра \"index\". Имаме: {0}" -#: ../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." @@ -4530,6 +4692,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 "" @@ -4599,6 +4760,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" @@ -4606,6 +4767,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" @@ -4662,6 +4823,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 "" @@ -4696,7 +4857,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 "" "Има {0} допълнителни примитиви използвани от релация {1}
които са " @@ -4846,5 +5007,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 "" @@ -4979,5 +5140,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 "Приложи" @@ -5077,7 +5238,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" @@ -5087,6 +5248,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" @@ -5120,7 +5281,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 "Роля:" @@ -5209,5 +5368,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 @@ -5255,6 +5414,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" -msgstr "" -"Прилагане на разрешените конфликти и затваряне на диалоговия прозорец" +msgstr "Прилагане на разрешените конфликти и затваряне на диалоговия прозорец" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 @@ -5273,10 +5431,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 "" @@ -5351,18 +5508,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 @@ -5372,14 +5529,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 +msgstr "Презареждане на всички текущо избрани обекти и опресняване на списъка." + +#: ../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 "Показване историята на избраните елементи." @@ -5572,5 +5728,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 "" @@ -5613,25 +5769,25 @@ 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." @@ -5640,5 +5796,5 @@ "левия панел." -#: ../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 "Натиснете за да минимизирате/максимизирате съдържанието на панела" @@ -5698,37 +5854,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 "" @@ -5739,63 +5895,91 @@ "заредена." -#: ../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 "Сваляне на връзка {0}" -#: ../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/GenericRelationEditor.java:158 +#: ../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] "Сваляне всички непълни пътища и възли от връката" + +#: ../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 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "Сваляне на връзка {0}" + +#: ../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:160 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 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 "" @@ -5805,15 +5989,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 " @@ -5821,5 +6005,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 " @@ -5827,20 +6011,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 "" @@ -5849,66 +6033,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 " @@ -5917,53 +6105,60 @@ 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" -msgstr "Сваляне всички непълни пътища и възли от връката" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../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: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 +#, fuzzy +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 "" @@ -5973,41 +6168,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 "" @@ -6047,19 +6235,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 "Създаване на нова релация в слой \"{0}\"" -#: ../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 "Редактиране на нова връзка в слой ''{0}''" -#: ../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}''" @@ -6071,6 +6259,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 "" @@ -6252,7 +6439,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 "" @@ -7025,5 +7211,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 @@ -7260,6 +7446,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 "" @@ -7269,6 +7455,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 "" @@ -7531,13 +7717,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}" @@ -7639,6 +7825,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 "" "Слоят ''{0}'' съдържа промени, които трябва да бъдат качени на сървъра." @@ -7724,6 +7909,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] "" @@ -7737,6 +7922,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 " @@ -7791,5 +7976,5 @@ msgstr "Подготовка на слоя ''{0}'' за качване..." -#: ../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 " @@ -7797,5 +7982,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 "" @@ -7868,40 +8053,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:" @@ -7910,5 +8095,5 @@ msgstr[1] "{0} обекта за добавяне:" -#: ../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:" @@ -7917,5 +8102,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:" @@ -7924,71 +8109,68 @@ msgstr[1] "{0} обекта за изтриване:" -#: ../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 +#: ../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}" @@ -7996,16 +8178,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}." @@ -8013,6 +8195,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 "" @@ -8021,5 +8203,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 "Подготовка на примитивите за качване ..." @@ -8049,111 +8231,57 @@ 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 "GPS Начало: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "GPS Край: {0}" - -#: ../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] "изображения" - -#: ../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 "Изображения JPEG (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "Невъзможно е да се прочете датата от файла \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "Липсва EXIF време във файла \"{0}\"." - -#: ../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 "Часова зона на GPS устойството (разлика със снимките)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Синхронизиране времето с GPS приемника" - -#: ../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 +#, fuzzy, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "Внимание: неуспешно записване на предпочитанията в ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 +#, fuzzy +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 +#, fuzzy +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} метри" + +#: ../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 @@ -8161,30 +8289,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 @@ -8192,5 +8320,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 @@ -8199,5 +8327,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 @@ -8206,58 +8334,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 "Наименувани точки от следа от {0}" -#: ../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 "Wave аудио файлове (*.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 "Изображения JPEG (*.jpg)" + +#: ../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 @@ -8265,5 +8398,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" @@ -8273,5 +8406,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 @@ -8279,22 +8412,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 "URL" - -#: ../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, " @@ -8303,5 +8431,5 @@ msgstr[1] "{0} маршрути, " -#: ../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" @@ -8310,24 +8438,24 @@ msgstr[1] "{0} точки на интерес" -#: ../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 "" -"Качването на необработени GPS данни в картата се смята за " -"вредно.
Ако искате да качвате следи, погледнете тук:" - -#: ../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 "" +"Качването на необработени GPS данни в картата се смята за вредно." +"
Ако искате да качвате следи, погледнете тук:" + +#: ../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 @@ -8337,29 +8465,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 "Свали от OSM по дължина на тази следа" -#: ../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 "" @@ -8370,9 +8498,9 @@ "Продължаване?" -#: ../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 "Няма GPX следа в слоя за да асоциираме звук с нея." -#: ../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 " @@ -8382,5 +8510,5 @@ "са пропуснати или преместени в началото." -#: ../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 " @@ -8390,23 +8518,23 @@ "смислено да се предположи тяхното време, бяха пропуснати." -#: ../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 "версия {0}" -#: ../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." @@ -8415,5 +8543,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 "" @@ -8427,5 +8555,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 "" @@ -8438,11 +8566,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" @@ -8451,32 +8579,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 "API версия: {0}" -#: ../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 "Преобразувай в слой GPX" -#: ../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 "" @@ -8484,6 +8612,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 "" @@ -8522,4 +8650,358 @@ msgstr[1] "{0} точки" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "GPX Файлове (*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "Файлът {0} е зареден вече под името \"{1}\"" + +#: ../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 "" +"Снимайте вашия GPS приемник, докато той показва времето.
Покажете " +"тази снимка тук.
И след това, просто вземете времето от снимката и " +"изберете времева зона
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Време на снимката (от EXIF):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "Gps време (прочетено от снимката по-горе): " + +#: ../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 "Синхронизиране време от снимка на GPS приемник" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"Грешка при разбор на датата.\n" +"Моля използвайте изисквания формат!" + +#: ../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 "<Няма още GPX следи заредени>" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +msgid "GPX track: " +msgstr "GPX следа: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Отвори друга GPX следа" + +#: ../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 "" +"Мога да фотографирам екрана на моя GPS приемник.
Това може ли да " +"помогне?" + +#: ../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 "Изображението няма EXIF позиция" + +#: ../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 "Съпоставяне на изображения с GPX следа" + +#: ../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 "Трябва да изберете GPX следа" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "Няма избрана GPX следа" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Грешка при разбор на времева зона.\n" +"Очакван формат: {0}" + +#: ../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 "" +"Грешка при разбор на отместване.\n" +"Очакван формат: {0}" + +#: ../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 "Открити {0} съвпадения на {1} в GPX следа {2}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "GPX Следата е заредена" + +#: ../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 "Избраната GPX следа не съдържа времена. Моля изберете друга." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "GPX следата няма информация за времето" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "Часови пояс: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "Минути: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "Секунди: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Съотнесени {0} от {1} снимки към GPX следа." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "(Времева разлика от {0} дни)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "Разминаване между следата и снимките: {0}мин {1}сек" + +#: ../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 "Извличане на GPS координати от EXIF" + +#: ../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 "Невъзможно да се вземе каноничното име на директория {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "Сканиране на директория {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "Намерен е празен файл в директория {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Грешка при четене на файлове от директория {0}\n" + +#: ../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 "Корелиране към GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "изображение" +msgstr[1] "изображения" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "{0} открити с gps тагове." + +#: ../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 "Зареждане {0}" + +#: ../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 "Грешка във файла {0}" + +#: ../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 "Показване на най-доброто оразмеряване и 1:1" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#, java-format +msgid "" +"\n" +"Altitude: {0} m" +msgstr "" +"\n" +"Височина: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} км/ч" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8843,5 +9325,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 @@ -9039,6 +9521,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 "" "Изобразвай стрелки с посоката, използвайки таблици вместо математически " @@ -9106,6 +9587,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 "Приложи изглаждане върху картата." @@ -9175,19 +9655,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 @@ -9448,6 +9928,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 "" @@ -9513,6 +9993,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 "" "

Освен това, бързите клавиши се активират, когато действията се " @@ -9530,9 +10010,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 "" "

Може да забележите, че в списъка за избор на клавиши на следващата " @@ -9547,6 +10026,6 @@ "клавиатура, '.'/Точка на Немска клавуатура, ...). Ако не спазвате това, може " "да настъпят конфликти, тъй като за JOSM няма начин да знае, че Ctrl+Shift+; " -"и Ctrl+: представляват всъщност една и съща комбинация на US " -"клавиатура...

" +"и Ctrl+: представляват всъщност една и съща комбинация на US клавиатура..." #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177 @@ -9575,6 +10054,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 "" "

Псевдо-модификатор 'изключено' ще изключва бърза клавишна комбинация.

" @@ -9668,5 +10147,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 "Повече информация за тази възможност" @@ -9753,5 +10232,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 @@ -9759,5 +10238,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9879,14 +10358,13 @@ msgstr "Непознат режим {0}." -#: ../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 @@ -9914,24 +10392,31 @@ 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}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9973,29 +10458,29 @@ 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 "Тази версия на JOSM е несъвместима с конфигурирания сървър." -#: ../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}." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#, fuzzy, java-format +msgid "" +"It supports protocol version 0.6, while the server says it supports {0} to " +"{1}." msgstr "" "Поддържа версии на протокола 0.5 и 0.6, докато сървъра казва че поддържа от " "{0} до {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "При комуникация с {0} се свързахме използвайки протокол версия {1}" -#: ../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 "" @@ -10003,66 +10488,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 "Успешно отворен списък с промени {0}" -#: ../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 "Изчакване 10 секунди " -#: ../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}." @@ -10097,5 +10582,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}''." @@ -10122,5 +10607,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}." @@ -10128,5 +10613,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}" @@ -10139,5 +10624,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}''." @@ -10197,7 +10682,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 "" @@ -10225,6 +10710,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 "" @@ -10290,26 +10775,26 @@ 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 "" @@ -10317,21 +10802,20 @@ "." -#: ../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 "" @@ -10339,19 +10823,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 "Непълна спецификация с ref=0" -#: ../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 "" @@ -10361,8 +10845,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 "" @@ -10372,25 +10856,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 "" @@ -10398,5 +10882,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10405,5 +10889,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10411,5 +10895,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10418,13 +10902,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 "Подготовка на OSM данните..." -#: ../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 "Подготвяне на базата данни ..." @@ -10477,4 +10961,10 @@ msgid "Contacting Server..." msgstr "Свързване със сървъра..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 +#, fuzzy, java-format +msgid "Expected value > 0 for parameter ''{0}'', got {1}" +msgstr "неочаквана стойност на параметъра \"index\". Имаме: {0}" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10513,43 +11003,44 @@ 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 +#, fuzzy, java-format +msgid "Value >0 expected for parameter ''{0}'', got {1}" +msgstr "неочаквана стойност на параметъра \"index\". Имаме: {0}" + +#: ../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 "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10590,17 +11081,27 @@ msgstr "Сваляне на добавката {0}..." -#: ../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 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Грешка при изтриването на файл на разширение: {0}" + +#: ../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}." @@ -10612,20 +11113,18 @@ msgstr "В разширение {0} възникна грешка" -#: ../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 "" -"Зареждането на добавката {0} беше заявено, но тя не се изисква повече." - -#: ../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" @@ -10634,51 +11133,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 "Последно обновление на модула преди повече от {0} дни." -#: ../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 "Добавката {0} изисква програмата JOSM да бъде обновена до {1}." -#: ../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 "Разширение {0} се изисква от разширение {1}, но не беше открито." -#: ../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 "Добавката не е открита: {0}." -#: ../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 "" -"Невъзможно зареждането на модул {0}. Да се премахне ли от настройките?" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220 +msgstr "Невъзможно зареждането на модул {0}. Да се премахне ли от настройките?" + #: ../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 " @@ -10688,9 +11186,9 @@ "право да презаписва текущите." -#: ../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 "" @@ -10700,10 +11198,10 @@ "\"{0}\"." -#: ../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 "Съгласно информацията в добавката, авторът е {0}." -#: ../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." @@ -10712,9 +11210,9 @@ "за грешка." -#: ../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 " @@ -10724,13 +11222,13 @@ "да изключим разширенето." -#: ../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" @@ -10849,6 +11347,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 "" @@ -10873,6 +11371,6 @@ "the server URL in your preferences and your internet connection." msgstr "" -"Пропадна инициализацията на връзката със сървъра на OSM " -"{0}.
Проверете URL на сървъра в настройките, а също и Вашата връзка с " +"Пропадна инициализацията на връзката със сървъра на OSM {0}." +"
Проверете URL на сървъра в настройките, а също и Вашата връзка с " "Интернет." @@ -10889,6 +11387,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 "" @@ -10950,7 +11448,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 "" @@ -10962,7 +11459,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 "" @@ -10994,6 +11491,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 "" @@ -11255,5 +11752,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" @@ -11268,12 +11765,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 @@ -11281,456 +11776,144 @@ 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 "AgPifoJ - Геомаркирани картинки" - -#: ../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 "Показване на най-доброто оразмеряване и 1:1" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 -#, java-format -msgid "" -"\n" -"Altitude: {0} m" -msgstr "" -"\n" -"Височина: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} км/ч" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "Извличане на GPS координати от EXIF" - -#: ../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 "Невъзможно да се вземе каноничното име на директория {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "Сканиране на директория {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "Намерен е празен файл в директория {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Грешка при четене на файлове от директория {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "Корелиране към GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} открити с gps тагове." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "Отваряне на изображения с AgPifoJ..." - -#: ../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 "GPX Файлове (*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "Файлът {0} е зареден вече под името \"{1}\"" - -#: ../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 "" -"Снимайте вашия GPS приемник, докато той показва времето.
Покажете " -"тази снимка тук.
И след това, просто вземете времето от снимката и " -"изберете времева зона
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Време на снимката (от EXIF):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "Gps време (прочетено от снимката по-горе): " - -#: ../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 "Синхронизиране време от снимка на GPS приемник" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"Грешка при разбор на датата.\n" -"Моля използвайте изисквания формат!" - -#: ../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 "<Няма още GPX следи заредени>" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 -msgid "GPX track: " -msgstr "GPX следа: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Отвори друга GPX следа" - -#: ../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 "" -"Мога да фотографирам екрана на моя GPS приемник.
Това може ли да " -"помогне?" - -#: ../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 "Изображението няма EXIF позиция" - -#: ../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 "Съпоставяне на изображения с GPX следа" - -#: ../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 "Трябва да изберете GPX следа" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Няма избрана GPX следа" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Грешка при разбор на времева зона.\n" -"Очакван формат: {0}" - -#: ../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 "" -"Грешка при разбор на отместване.\n" -"Очакван формат: {0}" - -#: ../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 "Открити {0} съвпадения на {1} в GPX следа {2}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX Следата е заредена" - -#: ../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 "Избраната GPX следа не съдържа времена. Моля изберете друга." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX следата няма информация за времето" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Часови пояс: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Минути: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Секунди: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Съотнесени {0} от {1} снимки към GPX следа." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Времева разлика от {0} дни)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Разминаване между следата и снимките: {0}мин {1}сек" - -#: ../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 "Зареждане {0}" - -#: ../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 "Грешка във файла {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11874,19 +12057,17 @@ #: ../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." -msgstr "" -"Специален доставчик на френски кадастров wms на " -"www.cadastre.gouv.fr

Моля прочетете правилата и условията за ползване " -"оттук (на френски):
" -"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " -"
преди да качвате каквито и да са данни създадени с това разширение." +"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 "" +"Специален доставчик на френски кадастров wms на www.cadastre.gouv." +"fr

Моля прочетете правилата и условията за ползване оттук (на " +"френски):
http://www.cadastre.gouv.fr/scpc/html/" +"CU_01_ConditionsGenerales_fr.html
преди да качвате каквито и да са " +"данни създадени с това разширение." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 @@ -12203,12 +12384,4 @@ msgstr "Експортирай във формат PNG (само растерни изображения)" -#: ../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] "Опростяване на път (премахната {0} точка)" -msgstr[1] "Опростяване на път (премахнати {0} точки)" - #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 @@ -12324,14 +12497,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 " @@ -12644,4 +12817,8 @@ msgstr "Отваряне на изобранията в ImageWayPoint" +#: ../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" @@ -12685,18 +12862,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 "Апроксимация Douglas-Peucker..." -#: ../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" @@ -12745,7 +12922,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12755,5 +12932,5 @@ #. 50000 #. -#. +#. #. #. @@ -12763,5 +12940,5 @@ #. 50000 #. -#. +#. #. #. @@ -12770,5 +12947,5 @@ #. 50000 #. -#. +#. #. #. @@ -12778,5 +12955,5 @@ #. 50000 #. -#. +#. #. #. @@ -12854,6 +13031,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 "Максимален брой сегменти в създаваните линии. По подразбиране 250." @@ -12876,7 +13052,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 "" "Точност на алгоритъма на Douglas-Peucker за опростяване на линии, измервана " @@ -12947,20 +13122,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 "Неуспешна връзка" @@ -13181,6 +13355,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 "" "Заглавната част съдържа няколко стойности и не може да бъде представена с " @@ -13256,6 +13429,5 @@ #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:49 msgid "Open only files that are visible in current view." -msgstr "" -"Отваряне само на файлове, които са видими в текущата област на екрана." +msgstr "Отваряне само на файлове, които са видими в текущата област на екрана." #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:59 @@ -13268,9 +13440,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 "Osmarender" -#: ../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 " @@ -13280,9 +13453,5 @@ "\"Картови настройки\" (Map Settings) от настройките." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "osmarender опции" - -#: ../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 "изпълним файл на Firefox" @@ -13562,6 +13731,5 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107 msgid "Duplicate hotkey for button '{0}' - button will be ignored!" -msgstr "" -"Дублирането на бърз клавиш за бутона '{0}' - бутона ще бъде игнориран!" +msgstr "Дублирането на бърз клавиш за бутона '{0}' - бутона ще бъде игнориран!" #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:47 @@ -13668,17 +13836,17 @@ "предпочитания." -#: ../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 "Обръщане разделянето на сграда" @@ -13722,169 +13890,4 @@ msgid "Optional" 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 "\"{0}\" не е затворен и съответно не може да бъде съединен." - -#: ../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 "" -"Избрания път(ища) имат възли извън района на свалените данни.\n" -"Това може да доведе до нежелано изтриване на възли, свързани с други " -"пътища.\n" -"Сигурни ли сте че искате да продължите?" - -#: ../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 "Можете също да поставите препратка URL от www.openstreetmap.org" - -#: ../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] "" -"Селекцията се състои от {0} път. Сигурни ли сте че искате да го опростите?" -msgstr[1] "" -"Селекцията се състои от {0} пътя. Сигурни ли сте че искате да ги опростите?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "Сигурни ли сте?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13984,5 +13987,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}" @@ -14035,34 +14038,34 @@ msgstr "Игнориране на избраните грешки в бъдеще." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../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:197 +#: ../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:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Нищо" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Игнориране на цялата група или на отделните елементи?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 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 "" @@ -14113,18 +14116,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 "Потвърждение" @@ -14363,7 +14366,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 "" "Източници на правила (URL или име на файл) за правописна проверка (see " @@ -14510,5 +14512,5 @@ #. 50000 #. -#. +#. #. #. @@ -14516,5 +14518,5 @@ #. #. -#. +#. #. #. @@ -14524,5 +14526,5 @@ #. 50000 #. -#. +#. #. #. @@ -14531,5 +14533,5 @@ #. 50000 #. -#. +#. #. #. @@ -14538,5 +14540,5 @@ #. 50000 #. -#. +#. #. #. @@ -14545,5 +14547,5 @@ #. 50000 #. -#. +#. #. #. @@ -14552,5 +14554,5 @@ #. 50000 #. -#. +#. #. #. @@ -14559,9 +14561,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14606,5 +14608,5 @@ #. 50000 #. -#. +#. #. #. @@ -14739,14 +14741,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 " @@ -14755,14 +14757,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 "" @@ -14771,5 +14773,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 "" @@ -14781,13 +14783,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." @@ -14949,50 +14951,50 @@ "разделителната способност." -#: ../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 "Запис на WMS слоя във файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "Запис на слоя WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "Зареждане на WMS слой от файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "Четене на WMS слой" -#: ../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 "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}" -#: ../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 "" @@ -15068,5 +15070,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 "" @@ -15108,23 +15110,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 "" -"Още едно geotag разширение за JOSM. Свързва снимки с GPS следи или импортира " -"EXIF гео-маркирани снимки." - -#. Plugin cadastre-fr -#: build/trans_plugins.java:7 msgid "A special handler for the French land registry WMS server." msgstr "Специален handler за френския поземлен регистър WMS сървър." #. Plugin colorscheme -#: build/trans_plugins.java:9 +#: build/trans_plugins.java:7 msgid "" "Allows the user to create different color schemes and to switch between " @@ -15141,21 +15136,21 @@ #. Plugin Create_grid_of_ways -#: build/trans_plugins.java:11 +#: build/trans_plugins.java:9 msgid "Create a grid of ways." msgstr "Създаване мрежа от пътища" #. Plugin czechaddress +#: build/trans_plugins.java:11 +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 " @@ -15166,10 +15161,10 @@ #. Plugin Duplicate-Way -#: build/trans_plugins.java:19 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "Дублира път с отместване." #. Plugin editgpx -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -15178,21 +15173,20 @@ #. Plugin globalsat +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." +msgstr "Сваляне GPS точки от Globalsat dg100 дата логер директно в JOSM." + +#. Plugin graphview #: build/trans_plugins.java:23 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." -msgstr "Сваляне GPS точки от Globalsat dg100 дата логер директно в JOSM." - -#. 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 -#: build/trans_plugins.java:27 msgid "Provide a background layer that displays a map grid" msgstr "Предоставя фонов слой, показващ мрежа на картата." #. Plugin ImageWayPoint -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -15205,17 +15199,17 @@ #. Plugin lakewalker -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Помага за векторизиране на WMS изображения." #. Plugin livegps +#: build/trans_plugins.java:31 +msgid "" +"Support live GPS input (moving dot) through a connection to gpsd server." +msgstr "" +"Поддържа GPS вход на живо (движеща се точка) чрез връзка с gpsd сървър." + +#. Plugin measurement #: build/trans_plugins.java:33 -msgid "" -"Support live GPS input (moving dot) through a connection to gpsd server." -msgstr "" -"Поддържа GPS вход на живо (движеща се точка) чрез връзка с gpsd сървър." - -#. Plugin measurement -#: build/trans_plugins.java:35 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -15228,10 +15222,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 " @@ -15240,5 +15234,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 " @@ -15251,15 +15245,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:41 msgid "Displays an OpenLayers background image" msgstr "Показва OpenLayers фоново изображение" #. Plugin openstreetbugs -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:43 msgid "Imports issues from OpenStreetBugs" msgstr "Вкарва проблеми от OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:45 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -15269,5 +15263,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:47 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -15277,5 +15271,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:49 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -15286,15 +15280,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:51 msgid "The great JGoodies Plastic Look and Feel." msgstr "Великият JGoodies Plastic Look and Feel." #. Plugin remotecontrol -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:53 msgid "Let other applications send commands to JOSM." msgstr "Позволява на други приложения да изпращат команди към JOSM." #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15303,10 +15297,10 @@ #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:57 msgid "Provides routing capabilities." msgstr "Предоставя маршрутизиращи възможности." #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:59 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -15317,15 +15311,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:61 msgid "Allow adding markers/nodes on current gps positions." msgstr "Позволява добавянето на маркери/възли на текущата gps позиция." #. Plugin tageditor -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:63 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Предоставя диалог за редактиране на маркери в табличен вид." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:65 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -15339,19 +15333,10 @@ #. Plugin terracer -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:67 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 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -15363,5 +15348,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15370,10 +15355,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, ...)." @@ -16426,8 +16411,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16624,5 +16609,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16632,5 +16617,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16649,5 +16634,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16657,5 +16642,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16674,5 +16659,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16682,5 +16667,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16699,5 +16684,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16707,5 +16692,5 @@ #. 300000 #. -#. +#. #. #. @@ -16720,5 +16705,5 @@ #. 300000 #. -#. +#. #. #. @@ -16736,5 +16721,5 @@ #. 50000 #. -#. +#. #. #. @@ -16752,5 +16737,5 @@ #. 40000 #. -#. +#. #. #. @@ -16759,5 +16744,5 @@ #. 40000 #. -#. +#. #. #. @@ -16767,5 +16752,5 @@ #. 50000 #. -#. +#. #. #. @@ -16785,5 +16770,5 @@ #. 50000 #. -#. +#. #. #. @@ -16792,5 +16777,5 @@ #. 50000 #. -#. +#. #. #. @@ -16800,5 +16785,5 @@ #. 50000 #. -#. +#. #. #. @@ -16848,7 +16833,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17547,5 +17532,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17584,5 +17569,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17678,5 +17663,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17833,5 +17818,5 @@ #. 50000 #. -#. +#. #. #. @@ -19218,5 +19203,5 @@ #. 30000 #. -#. +#. #. #. @@ -19226,5 +19211,5 @@ #. 40000 #. -#. +#. #. #. @@ -19234,5 +19219,5 @@ #. 20000 #. -#. +#. #. #. @@ -19242,5 +19227,5 @@ #. 40000 #. -#. +#. #. #. @@ -19598,7 +19583,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19608,5 +19593,5 @@ #. 50000 #. -#. +#. #. #. @@ -19616,5 +19601,5 @@ #. 50000 #. -#. +#. #. #. @@ -19624,5 +19609,5 @@ #. 50000 #. -#. +#. #. #. @@ -19632,5 +19617,5 @@ #. 50000 #. -#. +#. #. #. @@ -19640,5 +19625,5 @@ #. 50000 #. -#. +#. #. #. @@ -19648,5 +19633,5 @@ #. 50000 #. -#. +#. #. #. @@ -19656,5 +19641,5 @@ #. 50000 #. -#. +#. #. #. @@ -19664,5 +19649,5 @@ #. 50000 #. -#. +#. #. #. @@ -19672,5 +19657,5 @@ #. 50000 #. -#. +#. #. #. @@ -19680,5 +19665,5 @@ #. 50000 #. -#. +#. #. #. @@ -19688,5 +19673,5 @@ #. 50000 #. -#. +#. #. #. @@ -19696,5 +19681,5 @@ #. 50000 #. -#. +#. #. #. @@ -19704,5 +19689,5 @@ #. 50000 #. -#. +#. #. #. @@ -19712,5 +19697,5 @@ #. 50000 #. -#. +#. #. #. @@ -19720,5 +19705,5 @@ #. 50000 #. -#. +#. #. #. @@ -19728,5 +19713,5 @@ #. 50000 #. -#. +#. #. #. @@ -19736,5 +19721,5 @@ #. 50000 #. -#. +#. #. #. @@ -19744,5 +19729,5 @@ #. 50000 #. -#. +#. #. #. @@ -19752,5 +19737,5 @@ #. 50000 #. -#. +#. #. #. @@ -19760,5 +19745,5 @@ #. 50000 #. -#. +#. #. #. @@ -19768,5 +19753,5 @@ #. 50000 #. -#. +#. #. #. @@ -19776,5 +19761,5 @@ #. 50000 #. -#. +#. #. #. @@ -19784,5 +19769,5 @@ #. 50000 #. -#. +#. #. #. @@ -19792,5 +19777,5 @@ #. 50000 #. -#. +#. #. #. @@ -19800,5 +19785,5 @@ #. 50000 #. -#. +#. #. #. @@ -19808,5 +19793,5 @@ #. 50000 #. -#. +#. #. #. @@ -19816,5 +19801,5 @@ #. 50000 #. -#. +#. #. #. @@ -19824,5 +19809,5 @@ #. 50000 #. -#. +#. #. #. @@ -19832,5 +19817,5 @@ #. 50000 #. -#. +#. #. #. @@ -19840,5 +19825,5 @@ #. 50000 #. -#. +#. #. #. @@ -19848,5 +19833,5 @@ #. 50000 #. -#. +#. #. #. @@ -19856,5 +19841,5 @@ #. 50000 #. -#. +#. #. #. @@ -19864,5 +19849,5 @@ #. 50000 #. -#. +#. #. #. @@ -19872,5 +19857,5 @@ #. 50000 #. -#. +#. #. #. @@ -19880,5 +19865,5 @@ #. 50000 #. -#. +#. #. #. @@ -19888,5 +19873,5 @@ #. 50000 #. -#. +#. #. #. @@ -19896,5 +19881,5 @@ #. 50000 #. -#. +#. #. #. @@ -19904,5 +19889,5 @@ #. 50000 #. -#. +#. #. #. @@ -19912,5 +19897,5 @@ #. 50000 #. -#. +#. #. #. @@ -19920,5 +19905,5 @@ #. 50000 #. -#. +#. #. #. @@ -19928,5 +19913,5 @@ #. 50000 #. -#. +#. #. #. @@ -19936,5 +19921,5 @@ #. 50000 #. -#. +#. #. #. @@ -19944,5 +19929,5 @@ #. 50000 #. -#. +#. #. #. @@ -19952,5 +19937,5 @@ #. 50000 #. -#. +#. #. #. @@ -19960,5 +19945,5 @@ #. 50000 #. -#. +#. #. #. @@ -19968,5 +19953,5 @@ #. 50000 #. -#. +#. #. #. @@ -21660,7 +21645,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21670,5 +21655,5 @@ #. 50000 #. -#. +#. #. #. @@ -21678,5 +21663,5 @@ #. 50000 #. -#. +#. #. #. @@ -21686,5 +21671,5 @@ #. 50000 #. -#. +#. #. #. @@ -21694,5 +21679,5 @@ #. 50000 #. -#. +#. #. #. @@ -21702,5 +21687,5 @@ #. 50000 #. -#. +#. #. #. @@ -21710,5 +21695,5 @@ #. 50000 #. -#. +#. #. #. @@ -21718,5 +21703,5 @@ #. 50000 #. -#. +#. #. #. @@ -23047,5 +23032,5 @@ #. 40000 #. -#. +#. #. #. @@ -23061,5 +23046,5 @@ #. 30000 #. -#. +#. #. #. @@ -23070,7 +23055,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23080,5 +23065,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -23088,13 +23081,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -23104,5 +23089,5 @@ #. 50000 #. -#. +#. #. #. @@ -23135,5 +23120,5 @@ #. 50000 #. -#. +#. #. #. @@ -23149,5 +23134,5 @@ #. 50000 #. -#. +#. #. #. @@ -23157,5 +23142,5 @@ #. 10000 #. -#. +#. #. #. @@ -23165,5 +23150,5 @@ #. 10000 #. -#. +#. #. #. @@ -23174,5 +23159,5 @@ #. 10000 #. -#. +#. #. #. @@ -23201,5 +23186,5 @@ #. 50000 #. -#. +#. #. #. @@ -23314,9 +23299,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 @@ -23324,5 +23309,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, @@ -23332,8 +23317,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 @@ -23347,5 +23332,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23353,5 +23338,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23400,6 +23385,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23479,5 +23464,5 @@ #. 40000 #. -#. +#. #. #. @@ -23487,5 +23472,5 @@ #. 10000 #. -#. +#. #. #. @@ -23494,5 +23479,5 @@ #. 50000 #. -#. +#. #. #. @@ -23502,5 +23487,5 @@ #. 50000 #. -#. +#. #. #. @@ -23509,5 +23494,5 @@ #. 50000 #. -#. +#. #. #. @@ -23516,5 +23501,5 @@ #. 50000 #. -#. +#. #. #. @@ -23523,5 +23508,5 @@ #. 50000 #. -#. +#. #. #. @@ -23530,5 +23515,5 @@ #. 50000 #. -#. +#. #. #. @@ -23537,5 +23522,5 @@ #. 40000 #. -#. +#. #. #. @@ -23544,5 +23529,5 @@ #. 50000 #. -#. +#. #. #. @@ -23551,5 +23536,5 @@ #. 50000 #. -#. +#. #. #. @@ -23558,5 +23543,5 @@ #. 50000 #. -#. +#. #. #. @@ -23565,5 +23550,5 @@ #. 50000 #. -#. +#. #. #. @@ -23572,5 +23557,5 @@ #. 50000 #. -#. +#. #. #. @@ -23579,5 +23564,5 @@ #. 50000 #. -#. +#. #. #. @@ -23587,5 +23572,5 @@ #. 50000 #. -#. +#. #. #. @@ -23594,5 +23579,5 @@ #. 50000 #. -#. +#. #. #. @@ -23603,5 +23588,5 @@ #. 50000 #. -#. +#. #. #. @@ -23613,11 +23598,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23626,7 +23611,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23637,5 +23622,5 @@ #. 50000 #. -#. +#. #. #. @@ -23646,5 +23631,5 @@ #. 50000 #. -#. +#. #. #. @@ -23655,5 +23640,5 @@ #. 50000 #. -#. +#. #. #. @@ -23664,5 +23649,5 @@ #. 50000 #. -#. +#. #. #. @@ -23673,5 +23658,5 @@ #. 50000 #. -#. +#. #. #. @@ -23682,5 +23667,5 @@ #. 40000 #. -#. +#. #. #. @@ -23692,5 +23677,5 @@ #. 50000 #. -#. +#. #. #. @@ -23701,5 +23686,5 @@ #. 50000 #. -#. +#. #. #. @@ -23724,5 +23709,5 @@ #. 10000 #. -#. +#. #. #. @@ -23731,5 +23716,5 @@ #. 50000 #. -#. +#. #. #. @@ -23738,5 +23723,5 @@ #. 50000 #. -#. +#. #. #. @@ -23752,5 +23737,5 @@ #. 20000 #. -#. +#. #. #. @@ -23764,5 +23749,5 @@ #. 30000 #. -#. +#. #. #. @@ -23771,5 +23756,5 @@ #. 50000 #. -#. +#. #. #. @@ -23778,5 +23763,5 @@ #. 50000 #. -#. +#. #. #. @@ -23785,5 +23770,5 @@ #. 50000 #. -#. +#. #. #. @@ -23792,5 +23777,5 @@ #. 50000 #. -#. +#. #. #. @@ -23799,5 +23784,5 @@ #. 50000 #. -#. +#. #. #. @@ -23806,5 +23791,5 @@ #. 50000 #. -#. +#. #. #. @@ -23813,5 +23798,5 @@ #. 50000 #. -#. +#. #. #. @@ -23820,5 +23805,5 @@ #. 50000 #. -#. +#. #. #. @@ -23827,5 +23812,5 @@ #. 50000 #. -#. +#. #. #. @@ -23834,5 +23819,5 @@ #. 50000 #. -#. +#. #. #. @@ -23841,5 +23826,5 @@ #. 50000 #. -#. +#. #. #. @@ -23848,5 +23833,5 @@ #. 50000 #. -#. +#. #. #. @@ -23855,5 +23840,5 @@ #. 50000 #. -#. +#. #. #. @@ -23862,5 +23847,5 @@ #. 50000 #. -#. +#. #. #. @@ -24031,7 +24016,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24045,5 +24030,5 @@ #. 40000 #. -#. +#. #. #. @@ -24053,7 +24038,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24063,5 +24048,5 @@ #. 50000 #. -#. +#. #. #. @@ -24071,5 +24056,5 @@ #. 50000 #. -#. +#. #. #. @@ -24079,5 +24064,5 @@ #. 50000 #. -#. +#. #. #. @@ -24087,5 +24072,5 @@ #. 50000 #. -#. +#. #. #. @@ -24101,5 +24086,5 @@ #. 10000 #. -#. +#. #. #. @@ -24109,5 +24094,5 @@ #. 50000 #. -#. +#. #. #. @@ -24117,5 +24102,5 @@ #. 50000 #. -#. +#. #. #. @@ -24125,5 +24110,5 @@ #. 50000 #. -#. +#. #. #. @@ -24133,5 +24118,5 @@ #. 50000 #. -#. +#. #. #. @@ -24141,5 +24126,5 @@ #. 50000 #. -#. +#. #. #. @@ -24149,5 +24134,5 @@ #. 50000 #. -#. +#. #. #. @@ -24166,5 +24151,5 @@ #. 50000 #. -#. +#. #. #. @@ -24173,5 +24158,5 @@ #. 50000 #. -#. +#. #. #. @@ -24185,5 +24170,5 @@ #. 50000 #. -#. +#. #. #. @@ -24197,5 +24182,5 @@ #. 50000 #. -#. +#. #. #. @@ -24204,5 +24189,5 @@ #. 50000 #. -#. +#. #. #. @@ -24216,5 +24201,5 @@ #. 50000 #. -#. +#. #. #. @@ -24229,5 +24214,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24242,5 +24227,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24254,5 +24239,5 @@ #. 50000 #. -#. +#. #. #. @@ -24266,5 +24251,5 @@ #. 50000 #. -#. +#. #. #. @@ -24273,5 +24258,5 @@ #. 50000 #. -#. +#. #. #. @@ -24280,5 +24265,5 @@ #. 50000 #. -#. +#. #. #. @@ -24292,5 +24277,5 @@ #. 50000 #. -#. +#. #. #. @@ -24300,5 +24285,5 @@ #. 50000 #. -#. +#. #. #. @@ -24307,5 +24292,5 @@ #. 50000 #. -#. +#. #. #. @@ -24314,5 +24299,5 @@ #. 50000 #. -#. +#. #. #. @@ -24321,5 +24306,5 @@ #. 50000 #. -#. +#. #. #. @@ -24329,5 +24314,5 @@ #. 50000 #. -#. +#. #. #. @@ -24338,5 +24323,5 @@ #. 50000 #. -#. +#. #. #. @@ -24346,7 +24331,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24356,5 +24341,5 @@ #. 50000 #. -#. +#. #. #. @@ -24364,5 +24349,5 @@ #. 50000 #. -#. +#. #. #. @@ -24372,5 +24357,5 @@ #. 50000 #. -#. +#. #. #. @@ -24381,5 +24366,5 @@ #. 50000 #. -#. +#. #. #. @@ -24389,5 +24374,5 @@ #. 50000 #. -#. +#. #. #. @@ -24397,5 +24382,5 @@ #. 50000 #. -#. +#. #. #. @@ -24405,5 +24390,5 @@ #. 50000 #. -#. +#. #. #. @@ -24413,5 +24398,5 @@ #. 50000 #. -#. +#. #. #. @@ -24421,5 +24406,5 @@ #. 50000 #. -#. +#. #. #. @@ -24429,5 +24414,5 @@ #. 50000 #. -#. +#. #. #. @@ -24437,5 +24422,5 @@ #. 50000 #. -#. +#. #. #. @@ -24445,5 +24430,5 @@ #. 50000 #. -#. +#. #. #. @@ -24466,7 +24451,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24476,5 +24461,5 @@ #. 50000 #. -#. +#. #. #. @@ -24483,5 +24468,5 @@ #. 50000 #. -#. +#. #. #. @@ -24491,5 +24476,5 @@ #. 50000 #. -#. +#. #. #. @@ -24498,5 +24483,5 @@ #. 50000 #. -#. +#. #. #. @@ -24506,5 +24491,5 @@ #. 50000 #. -#. +#. #. #. @@ -24514,5 +24499,5 @@ #. 50000 #. -#. +#. #. #. @@ -24528,5 +24513,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24537,5 +24522,5 @@ #. 50000 #. -#. +#. #. #. @@ -24554,5 +24539,5 @@ #. 50000 #. -#. +#. #. #. @@ -24562,5 +24547,5 @@ #. 50000 #. -#. +#. #. #. @@ -24573,5 +24558,5 @@ #. 50000 #. -#. +#. #. #. @@ -24589,5 +24574,5 @@ #. 50000 #. -#. +#. #. #. @@ -24596,5 +24581,5 @@ #. 50000 #. -#. +#. #. #. @@ -24603,5 +24588,5 @@ #. 50000 #. -#. +#. #. #. @@ -24610,7 +24595,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24621,5 +24606,5 @@ #. 50000 #. -#. +#. #. #. @@ -24634,5 +24619,5 @@ #. 50000 #. -#. +#. #. #. @@ -24646,5 +24631,5 @@ #. 50000 #. -#. +#. #. #. @@ -24654,5 +24639,5 @@ #. 50000 #. -#. +#. #. #. @@ -24666,5 +24651,5 @@ #. 50000 #. -#. +#. #. #. @@ -24678,5 +24663,5 @@ #. 50000 #. -#. +#. #. #. @@ -24685,7 +24670,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24695,5 +24680,5 @@ #. 50000 #. -#. +#. #. #. @@ -24703,5 +24688,5 @@ #. 50000 #. -#. +#. #. #. @@ -24711,5 +24696,5 @@ #. 50000 #. -#. +#. #. #. @@ -24719,5 +24704,5 @@ #. 50000 #. -#. +#. #. #. @@ -24733,7 +24718,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24748,5 +24733,5 @@ #. 30000 #. -#. +#. #. #. @@ -24761,5 +24746,5 @@ #. 30000 #. -#. +#. #. #. @@ -24774,5 +24759,5 @@ #. 30000 #. -#. +#. #. #. @@ -24787,5 +24772,5 @@ #. 30000 #. -#. +#. #. #. @@ -24800,5 +24785,5 @@ #. 30000 #. -#. +#. #. #. @@ -24813,7 +24798,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24823,5 +24808,5 @@ #. 50000 #. -#. +#. #. #. @@ -24830,5 +24815,5 @@ #. 50000 #. -#. +#. #. #. @@ -24838,5 +24823,5 @@ #. 50000 #. -#. +#. #. #. @@ -24846,5 +24831,5 @@ #. 50000 #. -#. +#. #. #. @@ -24854,5 +24839,5 @@ #. 50000 #. -#. +#. #. #. @@ -24862,5 +24847,5 @@ #. 50000 #. -#. +#. #. #. @@ -24870,5 +24855,5 @@ #. 50000 #. -#. +#. #. #. @@ -24878,5 +24863,5 @@ #. 50000 #. -#. +#. #. #. @@ -24886,5 +24871,5 @@ #. 50000 #. -#. +#. #. #. @@ -24894,5 +24879,5 @@ #. 50000 #. -#. +#. #. #. @@ -24902,5 +24887,5 @@ #. 50000 #. -#. +#. #. #. @@ -24910,5 +24895,5 @@ #. 50000 #. -#. +#. #. #. @@ -24918,5 +24903,5 @@ #. 50000 #. -#. +#. #. #. @@ -24936,5 +24921,5 @@ #. 50000 #. -#. +#. #. #. @@ -24949,5 +24934,5 @@ #. 50000 #. -#. +#. #. #. @@ -24960,7 +24945,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24970,5 +24955,5 @@ #. 50000 #. -#. +#. #. #. @@ -24978,5 +24963,5 @@ #. 50000 #. -#. +#. #. #. @@ -24986,5 +24971,5 @@ #. 50000 #. -#. +#. #. #. @@ -24994,5 +24979,5 @@ #. 50000 #. -#. +#. #. #. @@ -25002,5 +24987,5 @@ #. 50000 #. -#. +#. #. #. @@ -25010,5 +24995,5 @@ #. 50000 #. -#. +#. #. #. @@ -25018,5 +25003,5 @@ #. 50000 #. -#. +#. #. #. @@ -25026,5 +25011,5 @@ #. 50000 #. -#. +#. #. #. @@ -25034,5 +25019,5 @@ #. 50000 #. -#. +#. #. #. @@ -25042,5 +25027,5 @@ #. 50000 #. -#. +#. #. #. @@ -25050,5 +25035,5 @@ #. 50000 #. -#. +#. #. #. @@ -25058,5 +25043,5 @@ #. 50000 #. -#. +#. #. #. @@ -25066,5 +25051,5 @@ #. 50000 #. -#. +#. #. #. @@ -25074,5 +25059,5 @@ #. 50000 #. -#. +#. #. #. @@ -25093,5 +25078,5 @@ #. 50000 #. -#. +#. #. #. @@ -25105,7 +25090,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25115,5 +25100,5 @@ #. 50000 #. -#. +#. #. #. @@ -25123,5 +25108,5 @@ #. 50000 #. -#. +#. #. #. @@ -25131,5 +25116,5 @@ #. 50000 #. -#. +#. #. #. @@ -25139,5 +25124,5 @@ #. 50000 #. -#. +#. #. #. @@ -25147,5 +25132,5 @@ #. 50000 #. -#. +#. #. #. @@ -25155,5 +25140,5 @@ #. 50000 #. -#. +#. #. #. @@ -25163,5 +25148,5 @@ #. 50000 #. -#. +#. #. #. @@ -25178,5 +25163,5 @@ #. 50000 #. -#. +#. #. #. @@ -25186,5 +25171,5 @@ #. 50000 #. -#. +#. #. #. @@ -25194,5 +25179,5 @@ #. 50000 #. -#. +#. #. #. @@ -25202,5 +25187,5 @@ #. 50000 #. -#. +#. #. #. @@ -25210,5 +25195,5 @@ #. 50000 #. -#. +#. #. #. @@ -25218,5 +25203,5 @@ #. 50000 #. -#. +#. #. #. @@ -25226,5 +25211,5 @@ #. 50000 #. -#. +#. #. #. @@ -25234,5 +25219,5 @@ #. 50000 #. -#. +#. #. #. @@ -25242,5 +25227,5 @@ #. 50000 #. -#. +#. #. #. @@ -25250,5 +25235,5 @@ #. 50000 #. -#. +#. #. #. @@ -25258,5 +25243,5 @@ #. 50000 #. -#. +#. #. #. @@ -25266,5 +25251,5 @@ #. 50000 #. -#. +#. #. #. @@ -25283,5 +25268,5 @@ #. 50000 #. -#. +#. #. #. @@ -25291,5 +25276,5 @@ #. 50000 #. -#. +#. #. #. @@ -25298,5 +25283,5 @@ #. 50000 #. -#. +#. #. #. @@ -25306,5 +25291,5 @@ #. 50000 #. -#. +#. #. #. @@ -25314,5 +25299,5 @@ #. 50000 #. -#. +#. #. #. @@ -25322,5 +25307,5 @@ #. 50000 #. -#. +#. #. #. @@ -25329,5 +25314,5 @@ #. 50000 #. -#. +#. #. #. @@ -25337,5 +25322,5 @@ #. 50000 #. -#. +#. #. #. @@ -25345,5 +25330,5 @@ #. 50000 #. -#. +#. #. #. @@ -25353,5 +25338,5 @@ #. 50000 #. -#. +#. #. #. @@ -25361,5 +25346,5 @@ #. 50000 #. -#. +#. #. #. @@ -25368,5 +25353,5 @@ #. 50000 #. -#. +#. #. #. @@ -25375,5 +25360,5 @@ #. 50000 #. -#. +#. #. #. @@ -25382,5 +25367,5 @@ #. 50000 #. -#. +#. #. #. @@ -25389,5 +25374,5 @@ #. 50000 #. -#. +#. #. #. @@ -25396,5 +25381,5 @@ #. 50000 #. -#. +#. #. #. @@ -25403,5 +25388,5 @@ #. 50000 #. -#. +#. #. #. @@ -25410,5 +25395,5 @@ #. 50000 #. -#. +#. #. #. @@ -25417,5 +25402,5 @@ #. 50000 #. -#. +#. #. #. @@ -25424,5 +25409,5 @@ #. 50000 #. -#. +#. #. #. @@ -25431,5 +25416,5 @@ #. 50000 #. -#. +#. #. #. @@ -25438,5 +25423,5 @@ #. 50000 #. -#. +#. #. #. @@ -25445,5 +25430,5 @@ #. 50000 #. -#. +#. #. #. @@ -25452,5 +25437,5 @@ #. 50000 #. -#. +#. #. #. @@ -25460,5 +25445,5 @@ #. 50000 #. -#. +#. #. #. @@ -25468,5 +25453,5 @@ #. 50000 #. -#. +#. #. #. @@ -25476,5 +25461,5 @@ #. 50000 #. -#. +#. #. #. @@ -25484,5 +25469,5 @@ #. 50000 #. -#. +#. #. #. @@ -25492,5 +25477,5 @@ #. 50000 #. -#. +#. #. #. @@ -25500,5 +25485,5 @@ #. 50000 #. -#. +#. #. #. @@ -25508,5 +25493,5 @@ #. 50000 #. -#. +#. #. #. @@ -25516,5 +25501,5 @@ #. 50000 #. -#. +#. #. #. @@ -25524,5 +25509,5 @@ #. 50000 #. -#. +#. #. #. @@ -25533,5 +25518,5 @@ #. 50000 #. -#. +#. #. #. @@ -25541,5 +25526,5 @@ #. 50000 #. -#. +#. #. #. @@ -25549,5 +25534,5 @@ #. 50000 #. -#. +#. #. #. @@ -25557,5 +25542,5 @@ #. 50000 #. -#. +#. #. #. @@ -25565,5 +25550,5 @@ #. 50000 #. -#. +#. #. #. @@ -25573,5 +25558,5 @@ #. 50000 #. -#. +#. #. #. @@ -25581,5 +25566,5 @@ #. 50000 #. -#. +#. #. #. @@ -25589,5 +25574,5 @@ #. 50000 #. -#. +#. #. #. @@ -25597,5 +25582,5 @@ #. 50000 #. -#. +#. #. #. @@ -25605,5 +25590,5 @@ #. 50000 #. -#. +#. #. #. @@ -25613,5 +25598,5 @@ #. 50000 #. -#. +#. #. #. @@ -25621,5 +25606,5 @@ #. 50000 #. -#. +#. #. #. @@ -25629,5 +25614,5 @@ #. 50000 #. -#. +#. #. #. @@ -25637,5 +25622,5 @@ #. 50000 #. -#. +#. #. #. @@ -25645,5 +25630,5 @@ #. 50000 #. -#. +#. #. #. @@ -25653,5 +25638,5 @@ #. 50000 #. -#. +#. #. #. @@ -25661,5 +25646,5 @@ #. 50000 #. -#. +#. #. #. @@ -25669,5 +25654,5 @@ #. 50000 #. -#. +#. #. #. @@ -25677,5 +25662,5 @@ #. 50000 #. -#. +#. #. #. @@ -25684,5 +25669,5 @@ #. 50000 #. -#. +#. #. #. @@ -25714,5 +25699,5 @@ #. 50000 #. -#. +#. #. #. @@ -25722,5 +25707,5 @@ #. 50000 #. -#. +#. #. #. @@ -25730,7 +25715,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25745,5 +25730,5 @@ #. 50000 #. -#. +#. #. #. @@ -25753,5 +25738,5 @@ #. 50000 #. -#. +#. #. #. @@ -25761,5 +25746,5 @@ #. 50000 #. -#. +#. #. #. @@ -25769,5 +25754,5 @@ #. 50000 #. -#. +#. #. #. @@ -25777,5 +25762,5 @@ #. 50000 #. -#. +#. #. #. @@ -25785,5 +25770,5 @@ #. 50000 #. -#. +#. #. #. @@ -25793,5 +25778,5 @@ #. 50000 #. -#. +#. #. #. @@ -25807,7 +25792,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25817,5 +25802,5 @@ #. 50000 #. -#. +#. #. #. @@ -25825,5 +25810,5 @@ #. 50000 #. -#. +#. #. #. @@ -25833,5 +25818,5 @@ #. 50000 #. -#. +#. #. #. @@ -25841,5 +25826,5 @@ #. 50000 #. -#. +#. #. #. @@ -25849,5 +25834,5 @@ #. 50000 #. -#. +#. #. #. @@ -25857,5 +25842,5 @@ #. 50000 #. -#. +#. #. #. @@ -25865,5 +25850,5 @@ #. 50000 #. -#. +#. #. #. @@ -25873,5 +25858,5 @@ #. 50000 #. -#. +#. #. #. @@ -25881,5 +25866,5 @@ #. 50000 #. -#. +#. #. #. @@ -25889,5 +25874,5 @@ #. 50000 #. -#. +#. #. #. @@ -25897,5 +25882,5 @@ #. 50000 #. -#. +#. #. #. @@ -25905,5 +25890,5 @@ #. 50000 #. -#. +#. #. #. @@ -25913,5 +25898,5 @@ #. 50000 #. -#. +#. #. #. @@ -25921,5 +25906,5 @@ #. 50000 #. -#. +#. #. #. @@ -25929,5 +25914,5 @@ #. 50000 #. -#. +#. #. #. @@ -25937,5 +25922,5 @@ #. 50000 #. -#. +#. #. #. @@ -25945,5 +25930,5 @@ #. 50000 #. -#. +#. #. #. @@ -25953,5 +25938,5 @@ #. 50000 #. -#. +#. #. #. @@ -25961,5 +25946,5 @@ #. 50000 #. -#. +#. #. #. @@ -25969,5 +25954,5 @@ #. 50000 #. -#. +#. #. #. @@ -25977,5 +25962,5 @@ #. 50000 #. -#. +#. #. #. @@ -25985,5 +25970,5 @@ #. 50000 #. -#. +#. #. #. @@ -25993,5 +25978,5 @@ #. 50000 #. -#. +#. #. #. @@ -26001,5 +25986,5 @@ #. 50000 #. -#. +#. #. #. @@ -26009,5 +25994,5 @@ #. 50000 #. -#. +#. #. #. @@ -26017,5 +26002,5 @@ #. 50000 #. -#. +#. #. #. @@ -26025,5 +26010,5 @@ #. 50000 #. -#. +#. #. #. @@ -26033,5 +26018,5 @@ #. 50000 #. -#. +#. #. #. @@ -26041,5 +26026,5 @@ #. 50000 #. -#. +#. #. #. @@ -26049,5 +26034,5 @@ #. 50000 #. -#. +#. #. #. @@ -26057,5 +26042,5 @@ #. 50000 #. -#. +#. #. #. @@ -26065,5 +26050,5 @@ #. 50000 #. -#. +#. #. #. @@ -26073,5 +26058,5 @@ #. 50000 #. -#. +#. #. #. @@ -26081,5 +26066,5 @@ #. 50000 #. -#. +#. #. #. @@ -26089,5 +26074,5 @@ #. 50000 #. -#. +#. #. #. @@ -26097,5 +26082,5 @@ #. 50000 #. -#. +#. #. #. @@ -26105,5 +26090,5 @@ #. 50000 #. -#. +#. #. #. @@ -26113,5 +26098,5 @@ #. 50000 #. -#. +#. #. #. @@ -26121,5 +26106,5 @@ #. 50000 #. -#. +#. #. #. @@ -26129,5 +26114,5 @@ #. 50000 #. -#. +#. #. #. @@ -26137,5 +26122,5 @@ #. 50000 #. -#. +#. #. #. @@ -26145,5 +26130,5 @@ #. 50000 #. -#. +#. #. #. @@ -26179,7 +26164,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26189,5 +26174,5 @@ #. 50000 #. -#. +#. #. #. @@ -26197,5 +26182,5 @@ #. 50000 #. -#. +#. #. #. @@ -26205,5 +26190,5 @@ #. 50000 #. -#. +#. #. #. @@ -26213,5 +26198,5 @@ #. 50000 #. -#. +#. #. #. @@ -26221,5 +26206,5 @@ #. 50000 #. -#. +#. #. #. @@ -26229,5 +26214,5 @@ #. 50000 #. -#. +#. #. #. @@ -26237,5 +26222,5 @@ #. 50000 #. -#. +#. #. #. @@ -26252,5 +26237,5 @@ #. 50000 #. -#. +#. #. #. @@ -26260,5 +26245,5 @@ #. 50000 #. -#. +#. #. #. @@ -26268,5 +26253,5 @@ #. 50000 #. -#. +#. #. #. @@ -26276,5 +26261,5 @@ #. 50000 #. -#. +#. #. #. @@ -26284,5 +26269,5 @@ #. 50000 #. -#. +#. #. #. @@ -26292,5 +26277,5 @@ #. 50000 #. -#. +#. #. #. @@ -26301,5 +26286,5 @@ #. 50000 #. -#. +#. #. #. @@ -26309,5 +26294,5 @@ #. 50000 #. -#. +#. #. #. @@ -26317,5 +26302,5 @@ #. 40000 #. -#. +#. #. #. @@ -26325,5 +26310,5 @@ #. 50000 #. -#. +#. #. #. @@ -26332,5 +26317,5 @@ #. 40000 #. -#. +#. #. #. @@ -26339,5 +26324,5 @@ #. 40000 #. -#. +#. #. #. @@ -26355,7 +26340,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26365,5 +26350,5 @@ #. 50000 #. -#. +#. #. #. @@ -26373,5 +26358,5 @@ #. 50000 #. -#. +#. #. #. @@ -26381,5 +26366,5 @@ #. 50000 #. -#. +#. #. #. @@ -26389,5 +26374,5 @@ #. 50000 #. -#. +#. #. #. @@ -26397,5 +26382,5 @@ #. 50000 #. -#. +#. #. #. @@ -26405,5 +26390,5 @@ #. 50000 #. -#. +#. #. #. @@ -26413,5 +26398,5 @@ #. 50000 #. -#. +#. #. #. @@ -26421,5 +26406,5 @@ #. 50000 #. -#. +#. #. #. @@ -26429,5 +26414,5 @@ #. 50000 #. -#. +#. #. #. @@ -26446,5 +26431,5 @@ #. 50000 #. -#. +#. #. #. @@ -26458,5 +26443,5 @@ #. 50000 #. -#. +#. #. #. @@ -26470,5 +26455,5 @@ #. 50000 #. -#. +#. #. #. @@ -26478,5 +26463,5 @@ #. 50000 #. -#. +#. #. #. @@ -26490,5 +26475,5 @@ #. 50000 #. -#. +#. #. #. @@ -26502,5 +26487,5 @@ #. 50000 #. -#. +#. #. #. @@ -26514,6 +26499,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26523,5 +26508,5 @@ #. 50000 #. -#. +#. #. #. @@ -26535,5 +26520,5 @@ #. 50000 #. -#. +#. #. #. @@ -26547,5 +26532,5 @@ #. 50000 #. -#. +#. #. #. @@ -26559,5 +26544,5 @@ #. 50000 #. -#. +#. #. #. @@ -26571,5 +26556,5 @@ #. 50000 #. -#. +#. #. #. @@ -26583,5 +26568,5 @@ #. 50000 #. -#. +#. #. #. @@ -26591,7 +26576,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26601,5 +26586,5 @@ #. 50000 #. -#. +#. #. #. @@ -26609,5 +26594,5 @@ #. 50000 #. -#. +#. #. #. @@ -26617,5 +26602,5 @@ #. 50000 #. -#. +#. #. #. @@ -26625,5 +26610,5 @@ #. 50000 #. -#. +#. #. #. @@ -26640,5 +26625,5 @@ #. 50000 #. -#. +#. #. #. @@ -26651,5 +26636,5 @@ #. 50000 #. -#. +#. #. #. @@ -26663,5 +26648,5 @@ #. 50000 #. -#. +#. #. #. @@ -26675,5 +26660,5 @@ #. 50000 #. -#. +#. #. #. @@ -26687,5 +26672,5 @@ #. 50000 #. -#. +#. #. #. @@ -26696,5 +26681,5 @@ #. 50000 #. -#. +#. #. #. @@ -26704,5 +26689,5 @@ #. 50000 #. -#. +#. #. #. @@ -26712,5 +26697,5 @@ #. 50000 #. -#. +#. #. #. @@ -26720,5 +26705,5 @@ #. 50000 #. -#. +#. #. #. @@ -26728,5 +26713,5 @@ #. 50000 #. -#. +#. #. #. @@ -26743,5 +26728,5 @@ #. 50000 #. -#. +#. #. #. @@ -26755,5 +26740,5 @@ #. 50000 #. -#. +#. #. #. @@ -26767,5 +26752,5 @@ #. 50000 #. -#. +#. #. #. @@ -26779,5 +26764,5 @@ #. 50000 #. -#. +#. #. #. @@ -26791,5 +26776,5 @@ #. 50000 #. -#. +#. #. #. @@ -26803,5 +26788,5 @@ #. 50000 #. -#. +#. #. #. @@ -26810,7 +26795,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26820,5 +26805,5 @@ #. 50000 #. -#. +#. #. #. @@ -26828,5 +26813,5 @@ #. 50000 #. -#. +#. #. #. @@ -26836,5 +26821,5 @@ #. 50000 #. -#. +#. #. #. @@ -26844,5 +26829,5 @@ #. 50000 #. -#. +#. #. #. @@ -26852,5 +26837,5 @@ #. 50000 #. -#. +#. #. #. @@ -26860,5 +26845,5 @@ #. 50000 #. -#. +#. #. #. @@ -26868,5 +26853,5 @@ #. 50000 #. -#. +#. #. #. @@ -26883,7 +26868,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26893,5 +26878,5 @@ #. 50000 #. -#. +#. #. #. @@ -26901,5 +26886,5 @@ #. 50000 #. -#. +#. #. #. @@ -26909,5 +26894,5 @@ #. 50000 #. -#. +#. #. #. @@ -26917,5 +26902,5 @@ #. 50000 #. -#. +#. #. #. @@ -26931,5 +26916,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26978,5 +26963,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26986,5 +26971,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26994,5 +26979,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27002,5 +26987,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27010,5 +26995,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27018,5 +27003,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27026,5 +27011,5 @@ #. 50000 #. -#. +#. #. #. @@ -27034,5 +27019,5 @@ #. 50000 #. -#. +#. #. #. @@ -27042,5 +27027,5 @@ #. 50000 #. -#. +#. #. #. @@ -27050,5 +27035,5 @@ #. 50000 #. -#. +#. #. #. @@ -27058,5 +27043,5 @@ #. 50000 #. -#. +#. #. #. @@ -27066,5 +27051,5 @@ #. 50000 #. -#. +#. #. #. @@ -27084,5 +27069,5 @@ #. 50000 #. -#. +#. #. #. @@ -27091,5 +27076,5 @@ #. 50000 #. -#. +#. #. #. @@ -27098,5 +27083,5 @@ #. 50000 #. -#. +#. #. #. @@ -27105,5 +27090,5 @@ #. 40000 #. -#. +#. #. #. @@ -27112,5 +27097,5 @@ #. 40000 #. -#. +#. #. #. @@ -27119,5 +27104,5 @@ #. 40000 #. -#. +#. #. #. @@ -27212,5 +27197,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -27218,28 +27203,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 @@ -27354,5 +27339,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27365,5 +27350,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27388,6 +27373,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27396,6 +27381,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27410,6 +27395,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 @@ -27423,6 +27408,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 @@ -27442,6 +27427,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27465,6 +27450,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 @@ -27477,5 +27462,99 @@ msgstr "" -#, java-format +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Невъзможно е връщането на командата ''{0}'', защото слой ''{1}'' не е " +#~ "наличен вече" + +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ 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 "No images with readable timestamps found." +#~ msgstr "Не е намерено изображение с информация за времето." + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS Начало: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS Край: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "текуща разлика: {0} с." + +#~ msgid "timezone difference: " +#~ msgstr "разлика в часови пояси: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} в пределите на следата" + +#~ msgid "Sync clock" +#~ msgstr "Синхронизация часовник" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Невъзможно е да се прочете датата от файла \"{0}\"" + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Липсва EXIF време във файла \"{0}\"." + +#~ msgid "Image" +#~ msgstr "Изображение" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Часова зона на GPS устойството (разлика със снимките)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Синхронизиране времето с GPS приемника" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Въведенето време не може да бъде използвано." + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "" +#~ "Зареждането на добавката {0} беше заявено, но тя не се изисква повече." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Геомаркирани картинки" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Отваряне на изображения с AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "osmarender опции" + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Още едно geotag разширение за JOSM. Свързва снимки с GPS следи или " +#~ "импортира EXIF гео-маркирани снимки." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Няколко помощни инструмента, които облекчават живота: например " +#~ "опрастяване на път, присъединяване на области, прескачане до позиция." + #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." @@ -27483,7 +27562,7 @@ #~ msgstr[1] "{0} Разширенията успешно обновени. Моля рестартирайте JOSM." -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" #~ "Разширение {0} изглежда повредено или не може да бъде свалено автоматично." @@ -27496,5 +27575,4 @@ #~ "повторете опита си по-късно." -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Невъзможно да се свали разширение: {0} от {1} достъпни" @@ -27515,5 +27593,4 @@ #~ msgstr "Намерен е елемент извън път." -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Игнориране на път, понеже съдържа несъществуващ елемент: {0}\n" @@ -27528,5 +27605,4 @@ #~ msgstr "Неправилен код на точка" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "За работа на модула е нужна по-нова версия на JOSM: {0}." @@ -27537,6 +27613,6 @@ #~ msgstr "" #~ "(Може да промените броя дни преди да се появи това предупреждение " -#~ "отново
чрез задаването на конфигурационната опция " -#~ "'pluginmanager.warntime'.)" +#~ "отново
чрез задаването на конфигурационната опция 'pluginmanager." +#~ "warntime'.)" #~ msgid "Unsaved Changes" @@ -27570,14 +27646,13 @@ #~ msgstr "Преместване" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Моля, съобщете за грешката на адрес {0}" #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" -#~ "Опитайте да обновите до най-нова версия на JOSM и на всички разширения преди " -#~ "да съобщите за грешка." +#~ "Опитайте да обновите до най-нова версия на JOSM и на всички разширения " +#~ "преди да съобщите за грешка." #~ msgid "Be sure to include the following information:" @@ -27586,9 +27661,6 @@ #~ msgid "Include your steps to get to the error (as detailed as possible)!" #~ msgstr "" -#~ "Укажете последователността от действия, която предизвика грешката (колкото " -#~ "се може по-подробно!)" - -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Моля, въведете първо желаните координати." +#~ "Укажете последователността от действия, която предизвика грешката " +#~ "(колкото се може по-подробно!)" #~ msgid "Select a bookmark first." @@ -27616,9 +27688,7 @@ #~ msgstr "Обект" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Автори: {0}" -#, java-format #~ msgid "Layers: {0}" #~ msgstr "Слоеве: {0}" @@ -27627,5 +27697,4 @@ #~ msgstr "Разрешяване конфликти." -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Конфликти: {0}" @@ -27646,5 +27715,4 @@ #~ msgstr "оправена версия:" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27658,8 +27726,4 @@ #~ msgstr "Файлът не е намерен" -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Изтриване {1} {0}" - #~ msgid "Conflicting relation" #~ msgstr "Конфликтиращи релации" @@ -27741,6 +27805,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -27757,6 +27821,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example,replacing 73 with your image id: \n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -27781,6 +27845,6 @@ #~ "За Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , ще се " #~ "нуждаете да въведете съответно подходящо 'id'.\n" -#~ "За да добавите Metacarta Map Rectifier меню елемент, ръчно създайте URL по " -#~ "примера по-долу, заменяйки 73 с вашето image id: \n" +#~ "За да добавите Metacarta Map Rectifier меню елемент, ръчно създайте URL " +#~ "по примера по-долу, заменяйки 73 с вашето image id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -27798,5 +27862,4 @@ #~ msgstr "Metacarta Map Rectifier image id" -#, java-format #~ msgid "rectifier id={0}" #~ msgstr "rectifier id={0}" @@ -27835,9 +27898,7 @@ #~ msgstr "Моля задайте низ за търсене" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Използване шаблон ''{0}'' от група ''{1}''" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Използване шаблон ''{0}''" @@ -27862,6 +27923,6 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" #~ "Възстановяване състоянието на всички текущо избрани обекти до версията, " @@ -27879,6 +27940,6 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" #~ "ВНИМАНИЕ: Паролата се съхранява в обиковен текст във файла с " @@ -27899,6 +27960,7 @@ #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." #~ msgstr "" -#~ "Източник (URL или име файл) на файлове с дефиниции на шаблони за маркиране. " -#~ "Вижте http://josm.openstreetmap.de/wiki/TaggingPresets за подробности." +#~ "Източник (URL или име файл) на файлове с дефиниции на шаблони за " +#~ "маркиране. Вижте http://josm.openstreetmap.de/wiki/TaggingPresets за " +#~ "подробности." #~ msgid "Add a new tagging preset source to the list." @@ -27912,8 +27974,4 @@ #~ "JOSM за този проблем." -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Грешка при изтриването на файл на разширение: {0}" - #~ msgid "Plugin already exists" #~ msgstr "Разширението вече съществува" @@ -27922,5 +27980,4 @@ #~ msgstr "В релацията има празен член." -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -27929,14 +27986,12 @@ #~ "{0}" #~ msgstr "" -#~ "Архив с разширението вече съществува. Да се свали ли текущата версия и да се " -#~ "се изтрие съществуващия архив?\n" +#~ "Архив с разширението вече съществува. Да се свали ли текущата версия и да " +#~ "се се изтрие съществуващия архив?\n" #~ "\n" #~ "{0}" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Не може да се отвори директорията с предпочитания: {0}" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27966,5 +28021,4 @@ #~ "започнете нов слой в новата зона." -#, java-format #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "Разрешаване {0} конфликти в {1} обекти" @@ -27977,9 +28031,9 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" -#~ "Избраните пътища имат различни участия в релации. Въпреки това искате ли да " -#~ "ги обеденим?" +#~ "Избраните пътища имат различни участия в релации. Въпреки това искате ли " +#~ "да ги обеденим?" #~ msgid "All the ways were empty" @@ -27999,6 +28053,6 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" #~ "Вътрешна грешка: невъзможно да се проверят условията без слой. Моля, " @@ -28007,5 +28061,6 @@ #~ msgid "Please select one or more closed ways of at least four nodes." #~ msgstr "" -#~ "Моля, изберете един или повече затворени пътя, състоящи се от поне 4 точки." +#~ "Моля, изберете един или повече затворени пътя, състоящи се от поне 4 " +#~ "точки." #~ msgid "Some of the nodes are (almost) in the line" @@ -28034,5 +28089,4 @@ #~ "Възможно е да се редактират само справочните страници на JOSM Online Help" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Грешка при зареждане на страница {0}" @@ -28056,5 +28110,4 @@ #~ msgstr "Показване статуса на квадрант" -#, java-format #~ msgid "requested: {0}" #~ msgstr "изискани: {0}" @@ -28133,5 +28186,4 @@ #~ msgstr "Преместване нагоре" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Редактор релации: {0}" @@ -28144,5 +28196,4 @@ #~ "имат история." -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "Променете първо проекцията до {0}." @@ -28151,11 +28202,10 @@ #~ msgstr "Невалидна проекция" -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " #~ "continue?" #~ msgstr "" -#~ "Това действие ще изисква {0} индивидуални запитвания за сваляне. Желаете ли " -#~ "да продължите?" +#~ "Това действие ще изисква {0} индивидуални запитвания за сваляне. Желаете " +#~ "ли да продължите?" #~ msgid "Update Data" @@ -28163,12 +28213,13 @@ #~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You can " -#~ "adjust the sliders to manually match the photos." +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." #~ msgstr "" -#~ "Възникна грешка при опит да се съотнесат снимките към GPX следата. Може да " -#~ "промените настройките на ръчно съотнасяне на снимки." +#~ "Възникна грешка при опит да се съотнесат снимките към GPX следата. Може " +#~ "да промените настройките на ръчно съотнасяне на снимки." #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" #~ "Не са открити данни за обновяване. Отваряли или зареждали ли сте слой с " @@ -28195,14 +28246,14 @@ #~ msgid "" #~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to OSM " -#~ "eg. deleting uninteresting parts of track." +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." #~ msgstr "" -#~ "Основното качество на разширението е възможността за изтриване на точки от " -#~ "GPX следи. Това разширение може да се използва да подготви следа за качване " -#~ "на OSM, примерно чрез изтриване на неинтересните части от следата." +#~ "Основното качество на разширението е възможността за изтриване на точки " +#~ "от GPX следи. Това разширение може да се използва да подготви следа за " +#~ "качване на OSM, примерно чрез изтриване на неинтересните части от следата." #~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to selected " -#~ "user, opens browser showing selected author profile page." +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." #~ msgstr "" #~ "Инструменти за работа с автори/потребители. Избиране картови данни, които " @@ -28225,5 +28276,4 @@ #~ msgstr "Не може да се прочетат числова стойност от отговора" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28244,5 +28294,4 @@ #~ msgstr "Възстановяне от изтриване на път..." -#, java-format #~ msgid "Checking whether node {0} is gone ..." #~ msgstr "Проверка дали възел {0} е заминал..." @@ -28251,5 +28300,4 @@ #~ msgstr "Възстановяване от изтриване на релация..." -#, java-format #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Проверка дали примитив {0} е заминал..." @@ -28270,5 +28318,4 @@ #~ msgstr "Файлът не може да бъде намерен." -#, java-format #~ msgid "" #~ "WARNING: launching browser windows for the first {0} of {1} selected " @@ -28293,5 +28340,4 @@ #~ msgstr "Изтегляне на референтни точки..." -#, java-format #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" #~ msgstr "" @@ -28314,5 +28360,4 @@ #~ msgstr "точки" -#, java-format #~ msgid "" #~ "Uploading failed because a primitive you tried " @@ -28321,8 +28366,7 @@ #~ msgstr "" #~ "Качването пропадна защото примитивът, който се " -#~ "опитахте
да изтриете на съсрвъра вече е изтрит там.

Съобщението " -#~ "за грешка е:
{0}" - -#, java-format +#~ "опитахте
да изтриете на съсрвъра вече е изтрит там." +#~ "

Съобщението за грешка е:
{0}" + #~ msgid "" #~ "Failed to access system property ''{0}'' for security reasons. Exception " @@ -28332,5 +28376,4 @@ #~ "сигурност. Съобщение: {1}" -#, java-format #~ msgid "An error occurred while saving. Error is: {0}" #~ msgstr "Възникна грешка при записа. Грешката е: {0}" @@ -28339,5 +28382,4 @@ #~ msgstr "Не може да се търси защото няма заредени данни" -#, java-format #~ msgid "removing reference from way {0}" #~ msgstr "премахване на справка от път {0}" @@ -28361,20 +28403,17 @@ #~ msgstr "Копиране на подразбиращите се" -#, java-format #~ msgid "Do you really want to delete layer ''{0}''?" #~ msgstr "Наистина ли искате да изтриете слой ''{0}''?" -#, java-format #~ msgid "Deleting layer {0} of {1}" #~ msgstr "Изтриване слой {0} от {1}" #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" #~ "Избраните точки участват в различни връзки. Искате ли да ги обедините, " #~ "въпреки това?" -#, java-format #~ msgid "Remove relation member {0} {1}" #~ msgstr "Премахване на члена {0} {1} от връзката" @@ -28389,5 +28428,4 @@ #~ msgstr "Използване на нов списък с промени и затваряне" -#, java-format #~ msgid "" #~ "There are unsaved changes in {0} layer. Discard the changes and continue?" @@ -28399,10 +28437,8 @@ #~ "Има незапазени промени в {0} слоя. Отхвърляне на промените и продължаване?" -#, java-format #~ msgid "Use the existing changeset {0} and close it after upload" #~ msgstr "" #~ "Използване на съществуващия списък с промени {0}. След качване се затваря." -#, java-format #~ msgid "Use the existing changeset {0} and leave it open" #~ msgstr "" @@ -28416,32 +28452,28 @@ #~ msgstr "Няма отворен списък с промени. Отваряме нов списък ..." -#, java-format #~ msgid "" #~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " #~ "relation?" #~ msgstr "" -#~ "Избраният обект \"{0}\" е част от релация \"{1}\".
Да го изтрием ли " -#~ "от релацията?" - -#, java-format +#~ "Избраният обект \"{0}\" е част от релация \"{1}\".
Да го изтрием " +#~ "ли от релацията?" + #~ msgid "" -#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " -#~ "from relation?" +#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." +#~ "
Delete from relation?" #~ msgstr "" -#~ "Избраният обект \"{0}\" е част от релация \"{1}\" с роля {2}.
Да го " -#~ "изтрием ли от релацията?" - -#, java-format +#~ "Избраният обект \"{0}\" е част от релация \"{1}\" с роля {2}.
Да " +#~ "го изтрием ли от релацията?" + #~ msgid "Help page missing. Create it in English." #~ msgstr "" #~ "Страницата с помощ липсва. Създайте я на английски." -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" -#~ "Страницата с помощ липсва. Създайте я на английски или " -#~ "на вашият език." +#~ "Страницата с помощ липсва. Създайте я на английски " +#~ "или на вашият език." #~ msgid "Didn't find an primitive with id {0} in this dataset" @@ -28453,11 +28485,10 @@ #~ msgid "" -#~ "Helppage missing. Create it in English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" -#~ "Липсва страница с помощ. Създайте я на английски или на вашия език." - -#, java-format +#~ "Липсва страница с помощ. Създайте я на английски или " +#~ "на вашия език." + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "неочаквана върната стойност {0}" @@ -28475,5 +28506,4 @@ #~ msgstr "няма намерена последна версия. Историята е празна." -#, java-format #~ msgid "Index out of bounds. Got {0}." #~ msgstr "индекс извън границите. Имаме: {0}" Index: /applications/editors/josm/i18n/po/cs.po =================================================================== --- /applications/editors/josm/i18n/po/cs.po (revision 18974) +++ /applications/editors/josm/i18n/po/cs.po (revision 18975) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 16:20+0100\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" "PO-Revision-Date: 2009-11-28 22:32+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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" @@ -116,5 +115,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 @@ -137,9 +136,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 @@ -155,20 +154,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 @@ -187,7 +182,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 "Chyba" @@ -267,5 +262,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 "Pluginy" @@ -306,4 +301,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 @@ -311,8 +308,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 @@ -322,29 +319,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 @@ -373,6 +368,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 "" "Není zde žádné vrstvy pro zdrojovou vrstvu
''{0}''
které by měly " @@ -426,14 +421,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 "Zeměpisná šířka" #: ../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 "Zeměpisná délka" @@ -459,10 +454,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 @@ -493,19 +488,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 @@ -514,9 +512,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 @@ -532,7 +527,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 @@ -544,11 +539,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" @@ -636,5 +631,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}" @@ -687,10 +682,10 @@ msgstr "Nemohu spojit cesty (Nemohou být spojeny do jednoho řetězce bodů)" -#: ../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 "Kombinovat {0} cesty" -#: ../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 "Prosím zvolte minimálně dvě cesty ke spojení" @@ -709,19 +704,19 @@ msgstr "Prosím zvol něco ke kopírování" +#: ../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 "Vytvořit kruh" -#: ../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 "Vytvořit kruh ze tří uzlů" -#: ../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 "Tyto body nejsou v kruhu. Přerušuji." -#: ../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 " @@ -733,9 +728,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 @@ -807,21 +802,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" @@ -829,6 +828,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 @@ -857,5 +856,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 "Duplikovat" @@ -912,8 +911,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 @@ -921,5 +918,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 @@ -932,8 +929,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 @@ -952,8 +949,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 @@ -976,13 +973,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 @@ -1024,4 +1022,105 @@ msgstr "Zobrazit informace o OSM bodech, cestách nebo relacích." +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "Spojit překrývající se plochy" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Joins areas that overlap each other" +msgstr "Spojí plochy, které se navzájem překrývají" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +msgid "Only up to two areas can be joined at the moment." +msgstr "Aktuálně lze sloučit maximálně pouze dvě plochy." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#, java-format +msgid "\"{0}\" is not closed and therefore can't be joined." +msgstr "\"{0}\" není uzavřená plocha a tedy nelze spojit." + +#: ../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 "" +"Zvolené cesty mají uzly mimo hranice stažené oblasti.\n" +"Toto může vést k nechtěnému smazání používaných uzlů.\n" +"Opravdu chcete pokračovat?" + +#: ../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 "Prosíme přerušte, pokud si nejste jisti" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 +msgid "Please select at least one closed way the should be joined." +msgstr "Vyberte alespoň jednu uzavřenou cestu k připojení." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +msgid "No intersection found. Nothing was changed." +msgstr "Nenalezen žádný průnik. Nic se nemění." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +msgid "Added node on all intersections" +msgstr "Přidány body na všechny průsečíky" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgid "Delete Ways that are not part of an inner multipolygon" +msgstr "Smazat cesty, které nejsou součástí vnižního multipolygonu." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +msgid "Fix relations" +msgstr "Opravit relace." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgid "Joined self-overlapping area" +msgstr "Spojena plocha překrývající sama sebe" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +msgid "Joined overlapping areas" +msgstr "Spojeny překrývající se plochy" + +#: ../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 "" +"Některé z cest byly prvky relací, které byly změněny. Prosíme, ověřte, zda " +"tímto nedošlo ke vzniku chyb." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +msgid "Enter values for all conflicts." +msgstr "Zadej hodnoty pro všechny konflikty" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Vyřešit konflikty" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +msgid "Fix tag conflicts" +msgstr "Opravit konflikty značek" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +msgid "Removed Element from Relations" +msgstr "Prvek odstraněn z relací" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +msgid "Join Areas: Remove Short Ways" +msgstr "Spojit plochy: Vymazat krátké cesty" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +msgid "Closed Way" +msgstr "Uzavřená cesta" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgid "Remove tags from inner ways" +msgstr "Odstranit tagy z vnitřních cest" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +msgid "Join Areas Function" +msgstr "Funkce spojení ploch" + #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 @@ -1041,4 +1140,45 @@ msgstr "Beze zkratky" +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Jump To Position" +msgstr "Skok na pozici" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Opens a dialog that allows to jump to a specific location" +msgstr "Otevře dialog umožňující skočit na zadané místo" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57 +msgid "Enter Lat/Lon to jump to position." +msgstr "Zadejte šířku/délku místa kam skočit." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 +msgid "You can also paste an URL from www.openstreetmap.org" +msgstr "Můžete též vložit URL z www.openstreetmap.org" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 +msgid "Zoom (in metres)" +msgstr "Přiblížení (v metrech)" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 +msgid "URL" +msgstr "URL" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 +msgid "Jump there" +msgstr "Skočit tam" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 +msgid "Jump to Position" +msgstr "Skok na místo" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Could not parse Latitude, Longitude or Zoom. Please check." +msgstr "Nelze rozpoznat šířku, délku nebo přiblížení. Prosím, zkontrolujte." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Unable to parse Lon/Lat" +msgstr "Nelze rozpoznat šířku/délku" + #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" @@ -1049,26 +1189,26 @@ msgstr "Sloučit aktuální vrstvu do jiné vrstvy" +#: ../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 "Spojit uzly" -#: ../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 "Spoj uzly do nejstaršího" -#: ../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 "Zvolte minimálně dva uzly ke spojení" -#: ../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 "" @@ -1076,5 +1216,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" @@ -1451,6 +1591,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 "" "Zobrazit zprávu o stavu s užitečnými informacemi, které se mohou přiložit k " @@ -1472,9 +1611,43 @@ #: ../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 "Zavřít" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Zjednodušit cestu" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Smazat nepotřebné uzly z cesty." + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "Vyberte alespoň jednu cestu k zjednodušení." + +#: ../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] "Výběr obsahuje {0} cestu. Opravdu ji chcete zjednodušit?" +msgstr[1] "Výběr obsahuje {0} cesty. Opravdu je chcete všechny zjednodušit?" +msgstr[2] "Výběr obsahuje {0} cest. Opravdu je chcete všechny zjednodušit?" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 +msgid "Are you sure?" +msgstr "Jste si jist?" + +#: ../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] "Zjednodušení cesty (odstranění {0} uzlu)" +msgstr[1] "Zjednodušení cesty (odstranění {0} uzlů)" +msgstr[2] "Zjednodušení cesty (odstranění {0} uzlů)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1538,7 +1711,7 @@ "should verify this and correct it when necessary." msgstr "" -"Relace založená na rolích byla zkopírována na všechny nové " -"cesty.
Mělo by být ověřeno, zda je zkopírování správné a případně " -"opraveno." +"Relace založená na rolích byla zkopírována na všechny nové cesty." +"
Mělo by být ověřeno, zda je zkopírování správné a případně opraveno." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 @@ -1607,6 +1780,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 "" "* Jeden uzel používaný více než jednou cestou a jednu z těchto cest, nebo" @@ -1690,54 +1862,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 "Stahuji data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "No current dataset found" msgstr "Nenalezena aktuální datová sada" -#: ../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 "V aktuální datové sadě není prvek s id {0}" -#: ../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 "Aktualizovat výběr" +#: ../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 "Prázdný výběr" -#: ../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 "Nahrát data" -#: ../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 "" @@ -1748,35 +1920,35 @@ "konflikty vyřešeny." -#: ../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 "Žádné změny k nahrání." -#: ../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 "Není nic k nahrání. Nejprve musíte mít nějaká data." -#: ../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 "Synchronizovat pouze bod {0}" -#: ../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 "Synchronizovat pouze cestu {0}" -#: ../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 "Syncronizovat pouze relaci {0}" -#: ../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 "Synchronizovat celý dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1784,9 +1956,8 @@ "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.
" +"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 "" "Aktualizace selhala, protože na serveru je novější " @@ -1798,26 +1969,25 @@ "pro přerušení a pokračování editace.
" -#: ../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 +#: ../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 "Objeveny konflikty" -#: ../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.
" +"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 "" "Aktualizace selhala, protože na serveru je novější " -"verze jednoho z vašich
bodů, cest nebo relací.

Klikněte " -"{0} pro synchronizaci kompletní lokální datové sady se " -"serverem.
Klikněte {1} pro přerušení a pokračování " -"editace.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 +"verze jednoho z vašich
bodů, cest nebo relací.

Klikněte " +"{0} pro synchronizaci kompletní lokální datové sady se serverem." +"
Klikněte {1} pro přerušení a pokračování editace.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1830,22 +2000,22 @@ "sadou změn." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 msgid "Changeset closed" msgstr "Sada změn byla uzavřena" -#: ../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 "" @@ -1856,15 +2026,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 "Bod je stále využit" -#: ../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 "Aktualizuji prvky" @@ -1876,6 +2046,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 "" @@ -1886,38 +2056,37 @@ "opakuji nahrávání." -#: ../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 "Objekt ''{0}'' je již smazán. Přeskakuji objekt při nahrávání." -#: ../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 "Nahrávám {0} objektů ..." -#: ../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 "Nahrát vybrané" -#: ../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 "Nahrát veškeré aktuálně vybrané změny na OSM server." -#: ../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 "Kontroluji rodiče smazaných objektů" -#: ../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 "Načítám rodiče ''{0}''" -#: ../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 "Kontroluji na smazané rodiče v lokálních datech" @@ -2082,13 +2251,12 @@ "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 "" "Ve vaší lokální datové sadě je {0} prvků, které
mohou být na " "serveru smazány. Pokud se pokusíte pozdějí o jejich smazání " -"nebo
aktualizaci, server bude pravděpodobně " -"reportovat
konflikt.

Klikněte {1} pro zjištění " -"stavu těchto prvků
na serveru.
Klikněte {2} pro " -"ignorování.
" +"nebo
aktualizaci, server bude pravděpodobně reportovat
konflikt." +"

Klikněte {1} pro zjištění stavu těchto prvků
na " +"serveru.
Klikněte {2} pro ignorování.
" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183 @@ -2156,38 +2324,38 @@ msgstr "vybráno" -#: ../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 "Nemůžu přidat uzel ležící mimo Zemi." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Přidat uzel" -#: ../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 "Přidat uzel do cesty" -#: ../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 "Spojit existující cestu do uzlu" -#: ../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 "Přidat nový uzel do již existující cesty" -#: ../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 "Přidat uzel do cesty a spojit" -#: ../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 "Vytvořit nový uzel." -#: ../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 "Vybrat uzel pod kurzorem." -#: ../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." @@ -2197,14 +2365,14 @@ msgstr[2] "Vložit nový uzel do {0} cest." -#: ../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 "Začít novou cestu od posledního uzlu." -#: ../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 "Pokračovat v cestě od posledního uzlu." -#: ../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 "Dokončit kreslení" @@ -2239,6 +2407,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 "" @@ -2342,5 +2510,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." @@ -2420,6 +2588,5 @@ msgid "" "type: - type of the object (node, way, relation)" -msgstr "" -"type: - typ objektu (node, way, relation)" +msgstr "type: - typ objektu (node, way, relation)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 @@ -2428,12 +2595,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - všechny objekty změněné uživatelem" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - objekt s daným ID (0 pro nové objekty)" -#: ../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 "nodes:... - objekt s daným počtem uzlů" -#: ../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-" @@ -2441,21 +2613,21 @@ 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 "modified - všechny změněné objekty" -#: ../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 "selected - všechny vybrané objekty" -#: ../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 "incomplete - všechny nekompletní objekty" -#: ../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 "untagged - všechny objekty bez tagů" -#: ../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" @@ -2463,5 +2635,5 @@ "child výraz - všechny podobjekty objektů odpovídajících výrazu" -#: ../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" @@ -2469,18 +2641,18 @@ "parent výraz - všechny rodiče objektů odpovídajících výrazu" -#: ../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 "Použijte | nebo OR ke kombinaci s logickým \"nebo\"" -#: ../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 "" "Použijte \" jako uvozovky (například pokud klíč obsahuje dvojtečku)" -#: ../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 "Použijte ( a ) k seskupení výrazů" -#: ../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 @@ -2490,55 +2662,55 @@ msgstr "Filtrovat" -#: ../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 "Hledat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Submit filter" msgstr "Přidat filtr" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Start Search" msgstr "Začít hledání" -#: ../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 "Nebyly nalezeny záznamy pro \"{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 "Nic nebylo přidáno výběrem hledáním \"{0}\"" -#: ../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 "Nic nebylo odstraněno výběrem hledáním \"{0}\"" -#: ../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 "Ve výběru se nenašlo nic při hledání ''{0}''" -#: ../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 "Nalezeno {0} odpovídajích výrazů" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2551,40 +2723,40 @@ "{2}" -#: ../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 "Neznámý prvek: {0}. Povolené hodnoty jsou bod, cesta nebo relace" -#: ../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 "Neočekávaný token: {0}" -#: ../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 "Chybějící argument pro \"NEBO\"" -#: ../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 "Chybějící argument pro \"NOT\"" -#: ../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 "Očekávám uzavírací závorku." -#: ../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 "" @@ -2593,9 +2765,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 "Chybný počet parametrů pro operátor nodes." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 #, java-format msgid "" @@ -2606,5 +2778,5 @@ "čísel, například nodes:10-20." -#: ../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." @@ -2655,15 +2827,14 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" +#, fuzzy, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" msgstr "" "Upozornění: automaticky mažu hodnotu tagu ''{0}'' na smazaném primitivu {1}" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2803,5 +2974,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 "Dvojí konflikt" @@ -2822,5 +2993,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 "" @@ -2839,19 +3011,19 @@ msgstr "nemohu vyřešit nerozhodnutý konflikt" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 +#: ../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 "Parametr ''{0}'' nesmí být prázdný" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61 +#: ../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:107 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 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" @@ -2861,5 +3033,5 @@ msgstr[2] "Smazat {0} objektů" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2869,5 +3041,5 @@ msgstr[2] "Smazat {0} uzlů" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2877,5 +3049,5 @@ msgstr[2] "Smazat {0} cest" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2887,16 +3059,16 @@ #. 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?" +#: ../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 "" "Chystáte se smazat uzly mimo oblast, jež jste stáhli.
To může způsobit " -"problémy, protože jiné objekty (které nevidíte) je mohou " -"používat.
Opravdu je chcete smazat?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +"problémy, protože jiné objekty (které nevidíte) je mohou používat." +"
Opravdu je chcete smazat?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "Potvrďte smazání" @@ -2915,15 +3087,15 @@ msgstr[2] "Přesunout uzly {0}" -#: ../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 "Odstraněný objekt ''{0}''" -#: ../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 "Odstraněno {0} objektů" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154 #, java-format msgid "" @@ -2934,5 +3106,5 @@ "{1}" -#: ../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}" @@ -2943,9 +3115,4 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Vyřešit konflikty v seznamu členů relace {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "Nelze zrušit příkaz ''{0}'' protože vrstva ''{1}'' již není dostupná" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3025,5 +3192,5 @@ msgstr "Použít ?" -#: ../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 " @@ -3170,6 +3337,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 "" @@ -3255,5 +3422,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3262,5 +3429,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3268,25 +3435,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 "J" #. 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 "S" #. 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 "Z" #. 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 "V" #: ../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 @@ -3309,25 +3476,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}" @@ -3335,6 +3503,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 "" @@ -3397,24 +3565,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 "očekáváno id >= 0. Nalezeno {0}" -#: ../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 "objekt s id=0 nemůže být neviditelný" -#: ../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 "očekáváno id > 0. Nalezeno {0}" -#: ../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 "očekávána verze > 0. Nalezena {0}" -#: ../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 " @@ -3422,5 +3590,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 "" @@ -3452,6 +3620,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}." @@ -3472,5 +3640,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 @@ -3482,6 +3649,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 "" @@ -3492,135 +3658,135 @@ msgstr "parameter {0} není v rozsahu 0..{1}, zadáno {2}" -#: ../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 "Cesta se stylem plochy není uzavřená." -#: ../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 "Cesta v multipolygonu ''{0}'' není uzavřena." -#: ../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 "Odstraněn prvek ''{0}'' z relace." -#: ../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 "Cesta ''{0}'' s méně, než dvěmi body." -#: ../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 "Nalezena více než jedna \"from\" cesta." -#: ../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 "Nalezeno více cílových \"to\" cest." -#: ../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 "Nalezen více než jeden \"via\"." -#: ../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 "Neznámá role ''{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 "Neznámý typ prvku pro ''{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 "Nenazezena příchozí cesta \"from\"." -#: ../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 "Nenalezena odchozí cesta \"to\"." -#: ../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 "Nenalezen \"via\" uzel nebo cesta." -#: ../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 "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../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 "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"." -#: ../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 "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"." -#: ../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 "Styl pro omezení {0} nenalezen." -#: ../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 "Cesty ''{0}'' a ''{1}'' se protínají." -#: ../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 "Vnitřní cesta ''{0}'' je venku." -#: ../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 "Žádná použitelná role ''{0}'' pro cestu ''{1}''." -#: ../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 "Ne-cesta ''{0}'' v multipolygonu." -#: ../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 "Multipolygon ''{0}'' nemá žádnou vnější cestu." -#: ../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 "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu." -#: ../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 "Styl pro vnější cestu ''{0}'' nesedí." -#: ../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 "nepopsaný" -#: ../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 "text" -#: ../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 "Chyba: {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}" @@ -3632,5 +3798,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 @@ -3651,5 +3817,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 @@ -3670,5 +3836,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 "pozadí" @@ -3786,6 +3952,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 "Nelze načíst záložky z
''{0}''
Chyba: {1}" @@ -3800,5 +3965,5 @@ msgstr "Znovu nezobrazovat" -#: ../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 @@ -3806,32 +3971,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 "nekompletní" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "silnice" -#: ../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 "železnice" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "vodní tok" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "využití oblasti (landuse)" -#: ../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" @@ -3841,5 +4006,5 @@ msgstr[2] "{0} uzlů" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -4093,12 +4258,12 @@ msgstr "Nastavení {0} bylo odstraněno, protože se již nepoužívá." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Soubor" -#: ../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 @@ -4112,19 +4277,19 @@ msgstr "Upravit" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Zobrazit" -#: ../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 "Nástroje" -#: ../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 "Předvolby" -#: ../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 @@ -4135,5 +4300,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Zvuk" @@ -4177,29 +4342,29 @@ msgstr "měřítko" -#: ../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 "Zeměpisná délka na místě kurzoru myši." -#: ../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 "Jméno objektu na místě kurzoru myši." -#: ../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 "Zeměpisná šířka na místě kurzoru myši." -#: ../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 "Úhel mezi předchozím a současným úsekem cesty." -#: ../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 "Délka nového nakresleného segmentu trasy." -#: ../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 " @@ -4207,9 +4372,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(žádný objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "Uživatel:" @@ -4240,6 +4405,5 @@ msgid "" "partial: different selected objects have different values, do not change" -msgstr "" -"částečně vybráno: vlastnost je u vybraných objektů nastavena rozdílně" +msgstr "částečně vybráno: vlastnost je u vybraných objektů nastavena rozdílně" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101 @@ -4323,5 +4487,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" @@ -4330,5 +4494,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" @@ -4337,5 +4501,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" @@ -4354,5 +4518,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 @@ -4369,5 +4533,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" @@ -4439,22 +4603,22 @@ msgstr "Řešení konfliktů" -#: ../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 "aktuální parametr je mimo rozsah: zadáno {0}" -#: ../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 "neočekávaná hodnota parametru \"index\". Zadáno {0}" -#: ../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." @@ -4488,6 +4652,5 @@ "List of merged elements. They will replace the my elements when the merge " "decisions are applied." -msgstr "" -"Seznam sloučených elementů. Nahradí mé elementy po potvrzení sloučení." +msgstr "Seznam sloučených elementů. Nahradí mé elementy po potvrzení sloučení." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 @@ -4520,6 +4683,5 @@ "Copy my selected elements before the first selected element in the list of " "merged elements." -msgstr "" -"Kopírovat mé vybrané elementy na začátek seznamu slučovaných elementů" +msgstr "Kopírovat mé vybrané elementy na začátek seznamu slučovaných elementů" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 @@ -4538,8 +4700,6 @@ #: ../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." -msgstr "" -"Kopírovat cizí vybrané elementy na konec seznamu slučovaných elementů" +msgid "Copy their selected elements to the end of the list of merged elements." +msgstr "Kopírovat cizí vybrané elementy na konec seznamu slučovaných elementů" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 @@ -4611,6 +4771,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" "Kliněte {0} pro zahájení slučování mých a cizích " @@ -4620,6 +4780,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" "Kliněte {0} pro dokončení slučování mých a cizích " @@ -4683,8 +4843,7 @@ #, java-format msgid "" -"An error occurred while communicating with the server
Details: " -"{0}" -msgstr "" -"Při komunikaci se serverem doslo k chybě
Detaily: {0}" +"An error occurred while communicating with the server
Details: {0}" +msgstr "Při komunikaci se serverem doslo k chybě
Detaily: {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 @@ -4718,7 +4877,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 "" "Je zde dalších {0} prvků na něž odkazuje relace {1}
a jsou smazány " @@ -4854,6 +5013,6 @@ "dataset.
Do you agree?" msgstr "" -"JOSM odstraní lokální prvek s id {0}
z datové " -"sady.
Souhlasíte?" +"JOSM odstraní lokální prvek s id {0}
z datové sady.
Souhlasíte?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 @@ -4870,8 +5029,7 @@ msgstr "Prvek" -#: ../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 "" -"sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení" +msgstr "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 @@ -5004,5 +5162,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 "Aplikovat" @@ -5103,7 +5261,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" @@ -5114,6 +5272,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" @@ -5148,7 +5306,5 @@ msgstr "Zatím nerozhodnuto" -#. --- 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 "Role:" @@ -5237,5 +5393,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 @@ -5302,10 +5458,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 "" @@ -5380,18 +5535,18 @@ msgstr "Mód filtrování" -#: ../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 "Historie" -#: ../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 "Zobrazit historii všech zobrazených objektů" -#: ../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 "Objekt s historií" -#: ../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 @@ -5401,13 +5556,13 @@ msgstr "Znovu načíst" -#: ../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 "Znovu nahrát vybrané objekty a obnovit seznam." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303 msgid "Show" msgstr "Zobrazit" -#: ../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 "Zobrazit historii vybraných objektů." @@ -5602,5 +5757,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 "Vytvořit kopii relace a otevřít ji v novém okně" @@ -5643,25 +5798,25 @@ msgstr "Přiblížit na výběr" -#: ../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 "Výběr: Rel.:{0} / Cest:{1} / Uzlů:{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 "Výběr" -#: ../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 "Výběr: {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 "Vytrhnout panel" -#: ../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." @@ -5670,5 +5825,5 @@ "nástrojů." -#: ../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 "Minimalizovat nebo maximalizovat obsah panelu" @@ -5731,37 +5886,37 @@ msgstr "# Objekty" -#: ../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 "Upravit relaci na kterou odkazuje vybraný člen" -#: ../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 "Stáhnout všechny potomky relace (rekurzivně)" -#: ../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 "Stáhnout všechny potomky" -#: ../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 "Stáhnout vybrané relace" -#: ../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 "Stáhnout vybrané potomky" -#: ../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 "Stáhnout členy relace" -#: ../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 "Konflikty v datech" -#: ../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 "" @@ -5771,17 +5926,18 @@ "Potomek relace
{0}
byl smazán na serveru. Nemůže být stažen" -#: ../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 "Relace je smazána" -#: ../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 "Stahování relace {0}" -#: ../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}" @@ -5789,22 +5945,50 @@ "Upozornění: ignoruji výjimku, protože úloha byla přerušena. Výjimka: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +#: ../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] "Stáhnout všechny nekompletní cesty a uzly v relaci" +msgstr[1] "Stáhnout všechny nekompletní cesty a uzly v relaci" +msgstr[2] "Stáhnout všechny nekompletní cesty a uzly v relaci" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Stáhnout členy relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "Stahování relace {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 msgid "Tags and Members" msgstr "Značky a Členové" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Parent Relations" msgstr "Rodičovské relace" -#: ../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 "Potomci relace" -#: ../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 "Aplikovat roli" + +#: ../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 "Zadat roli všech členů relace" + +#: ../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?" +"relation itself.
This creates circular dependencies and is discouraged." +"
How do you want to proceed with circular dependencies?" msgstr "" "V této relaci je minimálně jeden prvek odkazující
na právě tuto " @@ -5812,28 +5996,28 @@ "provést s touto cyklickou závislostí?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 msgid "Remove them, clean up relation" msgstr "Odstranit, vyčistit relaci" -#: ../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 "Ignorovat, ponechat relaci jak je" -#: ../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?" +"primitive ''{0}''

Do you really want to add another relation member?" msgstr "" "Relace již obsahuje minimálně jeden prvek odkazující na
prvek " "''{0}''

Opravdu chcete přidat dalšího člena relace?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 msgid "Multiple members referring to same primitive" msgstr "Více členů odkazuje na stejný prvek" -#: ../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 "" @@ -5843,14 +6027,13 @@ msgstr "" "POukoušíte se vložit relaci samu do sebe.

Toto vytvoří cyklický " -"odkaz a proto není taková úprava povolena.
Přeskakuji relaci " -"''{0}''." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 +"odkaz a proto není taková úprava povolena.
Přeskakuji relaci ''{0}''." + +#: ../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 "" -"Přidat všechny vybrané prvky z aktuální datové sady před prvního člena" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 +msgstr "Přidat všechny vybrané prvky z aktuální datové sady před prvního člena" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -5858,5 +6041,5 @@ "Přidat všechny vybrané prvky z aktuální datové sady za posledního člena" -#: ../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 " @@ -5866,5 +6049,5 @@ "člena" -#: ../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 " @@ -5874,20 +6057,20 @@ "člena" -#: ../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 "Odstranit všechny členy odkazující na některý z vybraných prvků" #. 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 "Editor relací: Odstranit vybrané" -#: ../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 "Vybrat členy relace odkazující na prvky v aktuálním výběru" -#: ../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 "" @@ -5896,66 +6079,70 @@ msgstr "Vybrat členy relace odkazující na {0} prvků v aktuálním výběru" -#: ../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 "Vybrat prvky pro vybrané členy relace" -#: ../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 "Seřadit členy relace" -#. 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 "Sport" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 msgid "Relation Editor: Sort" msgstr "Editor relací: Třídění" -#: ../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 "Přesunout zvolené členy nahoru" #. 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 "Editor relací: Posun nahoru" -#: ../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 "Přesunout zvolené členy dolů" #. 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 "Editor relací: Posun dolů" -#: ../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 "Odstranit vybrané členy z relace" #. 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 "Editor relací: Odstranit" -#: ../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 "Smazat editovanou relaci" -#: ../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 "Ano, vytvořit konflikt a zavřít" -#: ../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 "Ne, pokračovat v editaci" +#: ../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 " @@ -5964,53 +6151,60 @@ 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 "Konflikt v datech" -#: ../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 "Aplikovat aktuální změny" -#: ../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 "Aplikovat změny a zavřít dialog" -#: ../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 "Zrušit změny a zavřít dialog" -#: ../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 "Přidat prázdnou značku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 -msgid "Download all incomplete ways and nodes in relation" -msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#, fuzzy +msgid "Download all incomplete members" +msgstr "Stáhnout členy relace" + +#: ../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 "Stáhnout prvky" -#: ../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 "Editor relací: Stáhnout členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#, fuzzy +msgid "Download selected incomplete members" +msgstr "Stáhnout členy relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 msgid "Sets a role for the selected members" msgstr "Nastaví roli pro vybrané členy" -#: ../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 "Aplikovat roli" -#: ../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 "" @@ -6022,41 +6216,34 @@ "role těchto prvků.
Opravdu chcete novou roli aplikovat?" -#: ../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 "Ano, aplikovat" -#: ../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 "Ne, neaplikovat" -#: ../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 "Potvrdit prázdnou roli" -#: ../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 "Upravit relaci na kterou odkazuje vybraný člen" -#. 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 "Zvětšit na" -#: ../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 "Zvětšování je neaktivní protože je neaktivní vrstva s touto relací" -#: ../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 "Zvětšování je neaktivní protože nebyl vybrán žádný člen" @@ -6096,19 +6283,19 @@ msgstr "Upravit vybranou relaci" -#: ../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 "Aplikovat změny" -#: ../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 "Vytvořit novou relaci ve vrstvě \"{0}\"" -#: ../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 "Upravit novou relaci ve vrstvě \"{0}\"" -#: ../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}''" @@ -6120,6 +6307,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 "Varovaní: ignoruji výjimku protože úloha byla přerušena. Výjimka: " @@ -6300,7 +6486,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 "" @@ -7073,5 +7258,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 @@ -7265,7 +7450,7 @@ "Hold left mousebutton and draw a frame." msgstr "" -"Zvětšení: Kolečko myši, dvojklik nebo Ctrl + Up/Down Posun " -"mapy: Držet pravé tlačítko myši a pohyb myší nebo kurzorové klávesy. " -"Výběr: Držet pravá tlačítko myši a nakreslit rámeček." +"Zvětšení: Kolečko myši, dvojklik nebo Ctrl + Up/Down Posun mapy: Držet pravé tlačítko myši a pohyb myší nebo kurzorové klávesy. Výběr: Držet pravá tlačítko myši a nakreslit rámeček." #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -7297,6 +7482,5 @@ #, java-format msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}" -msgstr "" -"Nepodařilo se načíst CSS soubor ''help-browser.css''. Výjimka je: {0}" +msgstr "Nepodařilo se načíst CSS soubor ''help-browser.css''. Výjimka je: {0}" #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164 @@ -7312,13 +7496,13 @@ "english.

Please help to improve the JOSM help system and fill in the " "missing information.You can both edit the help topic in your " -"local language ({1}) and the help topic in " -"english.

" -msgstr "" -"

Nápověda k tomuto tématu chybí

Nápověda k tématu {0} není aktuálně " -"dostupná. Chybí jak pro váš lokální jazyk ({1}), tak pro " -"angličtinu.

Prosím pomozte vylepšit nápovědu pro JOSM a doplňte " -"chybějící informace. Editovat můžete začít obsah ve vašem " -"lokálním jazyce ({1}) a v angličtině.

" +"local language ({1}) and the help topic in english." +msgstr "" +"

Nápověda k tomuto tématu chybí

Nápověda k tématu {0} není aktuálně " +"dostupná. Chybí jak pro váš lokální jazyk ({1}), tak pro angličtinu." +"

Prosím pomozte vylepšit nápovědu pro JOSM a doplňte chybějící " +"informace. Editovat můžete začít obsah ve vašem lokálním " +"jazyce ({1}) a v angličtině.

" #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 @@ -7327,6 +7511,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 "" "

Při získávání nápovědy došlo k chybě

Nezdařilo se otevřít stránku nápovědy na url {0}.
Toto bývá " -"nejčastěji síťový problém, prosím prověřte
vaší internetovou " -"přípojku" +"nejčastěji síťový problém, prosím prověřte
vaší internetovou přípojku" #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 @@ -7591,6 +7775,5 @@ msgid "" "Version {0} created on {1}" -msgstr "" -"Verze {0} vytvořená {1}" +msgstr "Verze {0} vytvořená {1}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 @@ -7598,13 +7781,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 "Informace o sadě změn" -#: ../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 "Spustit prohlížeč s informacemi o sadě změn" -#: ../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}" @@ -7705,6 +7888,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 "Vrstva ''{0}'' má změny, které by měly být nahrány na server." @@ -7791,6 +7973,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] "" @@ -7804,6 +7986,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 " @@ -7862,5 +8044,5 @@ msgstr "Připravuji vrstvu ''{0}'' pro nahrání na server ..." -#: ../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 " @@ -7870,5 +8052,5 @@ "nebo selhalo." -#: ../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 "Nekompletní nahrávání a/nebo ukládání" @@ -7941,40 +8123,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 "Nahrát na server" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 msgid "Settings" msgstr "Nastavení" -#: ../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 "Tagy nové sady změn" -#: ../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 "Objekty k přidání:" -#: ../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 "Objekty ke změnění:" -#: ../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 "Objekty ke smazání:" -#: ../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:" @@ -7984,5 +8166,5 @@ msgstr[2] "{0} objektů k přidání:" -#: ../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:" @@ -7992,5 +8174,5 @@ msgstr[2] "{0} objektů k úpravě:" -#: ../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:" @@ -8000,70 +8182,67 @@ msgstr[2] "{0} smazaných objektů:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 msgid "Upload Changes" msgstr "Nahrát změny na server" -#: ../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 "Nahrát změněné objekty" -#: ../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 "Prosím zadejte komentář k nahrávání této sady změn (min. 3 znaky)" -#: ../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 "Neplatný komentář k nahrávání" -#: ../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 "Prosím zadejte nejdříve pozadovanou pozici" + +#: ../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 "Zrušit nahrávání na server a pokračovat v editaci" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 -msgid "Upload all changes in one request" -msgstr "Nahrát všechny změny v jednom požadavku" - -#: ../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 "" -"Povoleno nahrává všechny změny najednou, zakázáno nahrává změnu každého " -"prvku samostatně" - -#: ../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 "Napište stručný komentář ke změnám, které nahráváte na server:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 msgid "Enter an upload comment (min. 3 characters)" msgstr "Zadejte komentář k nahrávání (min. 3 znaky)" -#: ../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 "Otevřít novou sadu změn" -#: ../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 "Otevřít novou sadu změn a použít ji v dalším nahrávání" -#: ../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 "Použít otevřenou sadu změn" -#: ../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 "Nahrát data do již otevřené sady změn" -#: ../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 "Zavřít sadu změn po nahrání." -#: ../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 "Vybrat pro zavření sady změn po následujícím nahrání" -#: ../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}" @@ -8071,16 +8250,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 "Nahrát seznam vašich otevřených sad změn ze serveru" -#: ../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 "Zavřít zvolenou otevřenou sadu změn" -#: ../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}." @@ -8088,6 +8267,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 "" @@ -8098,5 +8277,5 @@ "opakuji přenos." -#: ../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 "Připravuji objekty k nahrání na server ..." @@ -8126,112 +8305,58 @@ msgstr "Pokračovat v nahrávaní" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Obrázky pro {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "Číst GPX..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Žádný čas pro bod {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 "Nelze přečíst čas \"{0}\" z bodu {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 "Čtu {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou." - -#: ../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 "Obrázky s GPS souřadnicemi" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "Start GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "Konec GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "nynější odchylka: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "rozdíl časových pásem: " - -#: ../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] "obrázek" -msgstr[1] "obrázky" -msgstr[2] "obrázky" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Synchronizovat hodiny" - -#: ../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 "JPEG obrázky (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "Data v souboru \"{0}\" nemohla být parsována." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "V souboru \"{0}\" není časová značka EXIF" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Obrázek" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Synchronizace času s GPS přijímačem" - -#: ../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 "Zadaný čas nemůže být rozparsován" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, fuzzy, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "Chyba: neočekávaná řádka ''{0}'' v souboru záložek ''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 +#, fuzzy +msgid "Upload data in one request" +msgstr "Nahrát všechny změny v jednom požadavku" + +#: ../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 +#, fuzzy +msgid "(1 request)" +msgstr "Špatný požadavek" + +#: ../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} metrů" +msgstr[1] "{0} metrů" +msgstr[2] "{0} metrů" + +#: ../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 "Prosím zadejte řetězec filtru" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 +#, fuzzy, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "Do souboru ''{0}'' nelze zapisovat. Prosíme, vyberte jiný soubor." + +#: ../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 @@ -8239,30 +8364,30 @@ msgstr "gps bod" -#: ../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 "Přizpůsobit kreslení linií" -#: ../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 "Použít globální nastavení." -#: ../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 "Kreslit spojnice mezi body v této vrstvě" -#: ../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 "Nereslit spojnice mezi body v této vrstvě" -#: ../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 @@ -8270,5 +8395,5 @@ msgstr "Přizpůsobit barvu" -#: ../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 @@ -8277,5 +8402,5 @@ msgstr "Výchozí" -#: ../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 @@ -8284,58 +8409,63 @@ msgstr "Zvolit barvu" -#: ../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 "Značky z pojmenovaných bodů" -#: ../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 "Pojmenované body z {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215 msgid "Import Audio" msgstr "Importovat zvuk" -#: ../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 "Wave Audiosoubory (*.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 "Audio značky z {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 "Importovat obrázky" -#: ../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 "JPEG obrázky (*.jpg)" + +#: ../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 "Jméno: {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 @@ -8343,5 +8473,5 @@ msgstr "Popis: {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" @@ -8351,5 +8481,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 @@ -8357,22 +8487,17 @@ msgstr "Popis" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 msgid "Timespan" msgstr "Časový interval" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 msgid "Length" msgstr "Délka" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 -msgid "URL" -msgstr "URL" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443 msgid "Length: " msgstr "Délka: " -#: ../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, " @@ -8382,5 +8507,5 @@ msgstr[2] "{0} trasy, " -#: ../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" @@ -8390,24 +8515,24 @@ msgstr[2] "{0} značek" -#: ../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 "Převést do datové vrstvy" -#: ../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 "" -"Nahrání nezpracovaných GPS dat je považováno za poškozování " -"projektu.
Pokud chcete nahrát trasy, podívejte se tady:" - -#: ../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 "" +"Nahrání nezpracovaných GPS dat je považováno za poškozování projektu." +"
Pokud chcete nahrát trasy, podívejte se tady:" + +#: ../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 @@ -8417,29 +8542,29 @@ msgstr "Převedeno z: {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 "Stáhnout data z OSM podél této trasy" -#: ../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 "Stáhnout vše v rozmezí:" -#: ../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} metrů" -#: ../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 "Maximální plocha na požadavek:" -#: ../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} čtverečních km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8450,9 +8575,9 @@ "pokračovat?" -#: ../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 "Není dostupná žádná GPX trasa pro kterou by šel asociovat zvuk." -#: ../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 " @@ -8460,5 +8585,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 " @@ -8468,24 +8593,23 @@ "byly vynechány." -#: ../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 "Datová vrstva {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 "mimo stažený areál" -#: ../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 "verze {0}" -#: ../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 "" -"Varování: míchání dat z verze 0.6 a 0.5 má za výsledek data verze 0.5" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 +msgstr "Varování: míchání dat z verze 0.6 a 0.5 má za výsledek data verze 0.5" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333 #, java-format msgid "There was {0} conflict detected." @@ -8495,5 +8619,5 @@ msgstr[2] "Bylo nalezeno {0} konfliktů." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 #, java-format msgid "" @@ -8514,5 +8638,5 @@ "objektů
z lokální datové sady protože byly vymazány na serveru." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 #, java-format msgid "" @@ -8532,11 +8656,11 @@ "vyřešte je manuálně." -#: ../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 "Klikněte pro uzavření tohoto dialogu a návrat k editaci" -#: ../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" @@ -8546,32 +8670,32 @@ msgstr[2] "{0} smazáno" -#: ../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} se skládá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 msgid "unset" msgstr "nenastaveno" -#: ../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 "Verze API: {0}" -#: ../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 "Převédst do GPX vrstvy" -#: ../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 "" @@ -8579,6 +8703,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 "" @@ -8621,4 +8745,357 @@ msgstr[2] "{0} bodů" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "Soubory GPX (*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "Soubor {0} je načten pod jménem \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#, java-format +msgid "Error while parsing {0}" +msgstr "Chyba při parsování {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Nemůžu číst \"{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 "" +"Vyfotografujte váš GPS přijímač když ukazuje čas.
Zobrazte zde jeho " +"fotografii.
Poté zapište čas zobrazený na fotografii a vyberte časové " +"pásmo
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Čas fotografie (z exif):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "Čas GPS (načten z předchozích fotografií): " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [dd/mm/rrrr hh:mm:ss]" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +msgid "I'm in the timezone of: " +msgstr "Jsem v časovém pásmu: " + +#: ../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 "Žádné datum" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "Otevřít další fotografie" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +msgid "Synchronize time from a photo of the GPS receiver" +msgstr "Synchronizovat čas z fotografie GPS přijímače" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"Chyba při čtení data.\n" +"Prosíme, použijte požadvaný formát" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "Neplatné datum" + +#: ../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 "GPX trasa: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Otevřít jinou GPX trasu" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +msgid "Timezone: " +msgstr "Časové pásmo: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +msgid "Offset:" +msgstr "Posun:" + +#: ../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 "Mohu vyfotit můj GPS přijímač.
Může to pomoci?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 +msgid "Update position for: " +msgstr "Aktualizovat pozici pro: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 +msgid "All images" +msgstr "Všechny obrázky" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 +msgid "Images with no exif position" +msgstr "Obrázky bez exif pozice" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 +msgid "Not yet tagged images" +msgstr "Neotagované obrázky" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +msgid "Correlate images with GPX track" +msgstr "Korelovat obrázky s GPX trasou" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Correlate" +msgstr "Korelovat" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Auto-Guess" +msgstr "Auto-odhad" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +msgid "You should select a GPX track" +msgstr "Měli byste vybrat GPX trasu" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "Není vybrána GPX trasa" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Chyba při čtení časového pásma.\n" +"Očekávaný formát: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +msgid "Invalid timezone" +msgstr "Nepatné časové pásmo" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Chyba při čtení posunutí.\n" +"Očekávaný formát: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +msgid "Invalid offset" +msgstr "Neplatný posun" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "Nalezeno {0} shod s {1} v GPX trase {2}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "Nahrána GPX trasa" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 +msgid "The selected photos don't contain time information." +msgstr "Zvolené fotografie neobsahují informace o čase." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 +msgid "Photos don't contain time information" +msgstr "Fotografie neobsahují informace o čase" + +#: ../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 "Zvolená GPX trasa neobsahuje časové údaje. Zvolte, prosím, jinou." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "GPX trasa neobsahuje časové údaje" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "Časová zóna: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "Minuty: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "Sekundy: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "{0} z {1} fotografií bylo dosazeno do GPX trasy." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "(Časový rozdíl {0} dnů)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "Posun mezi trasou a fotografiemi: {0}m {1}s" + +#: ../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 "Dosazení fotografií do trasy selhalo." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +msgid "Adjust timezone and offset" +msgstr "Upravit časovou zónu a posun" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +msgid "Default Values" +msgstr "Výchozí hodnoty" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +msgid "Extracting GPS locations from EXIF" +msgstr "Extrahovat pozice GPS z EXIFu" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +msgid "Starting directory scan" +msgstr "Začínam prohledávat adresář" + +#: ../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 "Načíst fotografie..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "Čtu {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 "Nemohu najít výchozí cesto pro adresář {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "Prohledávám adresář {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "Nalezen nulový soubor v adresáři {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Chyba při získávání souborů z adresáře {0}\n" + +#: ../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 "Obrázky s GPS souřadnicemi" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "Korelovat vůči GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "obrázek" +msgstr[1] "obrázky" +msgstr[2] "obrázky" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "Bylo nalezeno {0} fotografií s GPS tagem." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +msgid "No image" +msgstr "Žádný obrázek." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "Nahrávám {0}" + +#: ../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 "Chyba v souboru {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Zobrazit geotagované fotografie" + +#: ../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 "Předchozí" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Odebrat fotografii z vrstvy" + +#: ../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 "Další" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "Centrovat pohled" + +#: ../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 "" +"\n" +"Výška: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8919,5 +9396,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 @@ -9113,6 +9590,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 "Zobrazovat směrové šipky pomocí tabulek místo komplexní matematiky." @@ -9175,6 +9651,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 "Aplikovat vyhlazování (antialiasing) v mapě pro jemnější zobrazení." @@ -9242,19 +9717,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 "Vzhled a chování" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Jazyk" + +#: ../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 "Výchozí (automaticky)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Jazyk" - -#: ../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 @@ -9513,6 +9988,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 "" @@ -9577,6 +10052,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 "" @@ -9589,9 +10064,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 "" @@ -9615,6 +10089,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 "" @@ -9708,5 +10182,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 "Více informací o tomto přednastavení" @@ -9794,5 +10268,5 @@ msgstr "Stahuji body {0} až {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 @@ -9800,5 +10274,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9920,15 +10394,14 @@ msgstr "Neznámý režim {0}." -#: ../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." +#: ../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 "" "v lokální datové sadě neexistuje prvek s id {0}. Nelze odvodit typ prvku" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../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 @@ -9956,20 +10429,20 @@ msgstr "Pro id {0} server odpověděl kódem 404. Přeskakuji." -#: ../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 "Stahuji balík uzlů z ''{0}''" -#: ../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 "Stahuji balík cest z ''{0}''" -#: ../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 "Stahuji balík relací z ''{0}''" -#: ../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 " @@ -9978,4 +10451,12 @@ "Server odpověděl chybovým kódem 404, opakování s individuálním požadavkem " "pro každý prvek" + +#: ../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] "Stahuji body {0} až {1}..." +msgstr[1] "Stahuji body {0} až {1}..." +msgstr[2] "Stahuji body {0} až {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10017,29 +10498,29 @@ 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 "Tato verze JOSM není kompatibilní s nakonfigurovaným serverem." -#: ../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}." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#, fuzzy, java-format +msgid "" +"It supports protocol version 0.6, while the server says it supports {0} to " +"{1}." msgstr "" "Podporuje protokol verzí 0.5 a 0.6, přičemž server hlásí podporu od {0} do " "{1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Komunikace s {0} zahájena za použití protokolu verze {1}" -#: ../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 "neočekávaný formát id získaný ze serveru, získáno ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 #, java-format msgid "" @@ -10048,66 +10529,66 @@ "neočekávaný formát nové verze modifikovaného prvku ''{0}'', zadáno ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 msgid "Creating changeset..." msgstr "Vytvářím sadu změn..." -#: ../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 "Úspěšně otevřená sada změn {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 msgid "Updating changeset..." msgstr "Aktualizuji sadu změn..." -#: ../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 "Aktualizuji sadu změn {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 msgid "Closing changeset..." msgstr "Zavírám sadu změn..." -#: ../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 "Není k dizpozici sada změn pro rozdílový upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "Preparing..." msgstr "Připravuji..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Nahrávám..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Waiting 10 seconds ... " msgstr "Čekám 10 sekund ... " -#: ../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 "Zkusím nový pokus, {0} z {1}, během {2} sekund ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 msgid "OK - trying again." msgstr "OK - další pokus." -#: ../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 "Zahajuji pokus {0} z {1}." -#: ../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 "Aktuální sada změn je prázdná. Nelze nahrávat data na server." -#: ../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 "ID aktuální sady změn musí být větší než 0. Aktuální ID je {0}." -#: ../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}." @@ -10142,5 +10623,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}''." @@ -10167,5 +10648,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}." @@ -10173,5 +10654,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}" @@ -10184,5 +10665,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}''." @@ -10241,11 +10722,11 @@ #: ../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." -msgstr "" -"VAROVÁNÍ: Heslo je uloženo jako běžný text v konfiguračním " -"souboru.
Heslo je jako text přenášeno na server a je součástí " -"URL.
Nepoužívejte hesla která chcete utajit." +"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 "" +"VAROVÁNÍ: Heslo je uloženo jako běžný text v konfiguračním souboru." +"
Heslo je jako text přenášeno na server a je součástí URL." +"
Nepoužívejte hesla která chcete utajit." #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 @@ -10272,6 +10753,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 "" "Došlo k chybě při obnovování zálohy souboru.
Chyba:
{0}" @@ -10344,29 +10825,28 @@ msgstr "Soubor \"{0}\" neexistuje" -#: ../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 "" -"Chybějící povinné atributy prvku ''bounds''. Nalezeno " -"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." - -#: ../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 "" +"Chybějící povinné atributy prvku ''bounds''. Nalezeno minlon=''{0}''," +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Found XML element not as direct child of element ." -msgstr "" -"Nalezen XML element jinde, než jako přímý potomek elementu " - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 +msgstr "Nalezen XML element jinde, než jako přímý potomek elementu " + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "Chybějící povinný atribut ''{0}'' na v cestě {1}" -#: ../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 "Neplatná hodnota atributu ''ref'' elementu . Nalezeno {0}" -#: ../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 "" @@ -10374,22 +10854,20 @@ "" -#: ../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 "Chybějící atribut ''ref'' na členu v relaci {0}" -#: ../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 "" -"Neplatná hodnota atributu ''ref'' na členu v relaci {0}. Nalezeno {1}" - -#: ../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 "Neplatná hodnota atributu ''ref'' na členu v relaci {0}. Nalezeno {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Chybějící atribut ''type'' na členu {0} v relaci {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 #, java-format msgid "" @@ -10398,19 +10876,19 @@ "Neplatná hodnota atributu ''type'' na členu {0} v relaci {1}. Nalezeno {2}." -#: ../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 "Nekompletní specifikace s ref=0" -#: ../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 "Neplatný objekt s 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 "" @@ -10420,8 +10898,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 "" @@ -10431,25 +10909,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 "Neznámá, nebo nepodporovaná verze API. Nalezeno {0}" -#: ../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 "Chybějící atribut ''version'' na OSM objektu s id {0}" -#: ../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 "Chybějící povinný atribut ''{0}''." -#: ../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 "" @@ -10457,5 +10935,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10464,5 +10942,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10470,5 +10948,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10477,13 +10955,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 "Připravuji OSM data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 msgid "Parsing OSM data..." msgstr "Zpracovávám OSM data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 msgid "Preparing data set..." msgstr "Připravuji data..." @@ -10536,4 +11014,10 @@ msgid "Contacting Server..." msgstr "Kontaktuji server..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 +#, fuzzy, java-format +msgid "Expected value > 0 for parameter ''{0}'', got {1}" +msgstr "neočekávaná hodnota parametru \"index\". Zadáno {0}" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10574,43 +11058,45 @@ "Neplatná hodnota pro atribut ''{0}'' na XML tagu ''{1}''. Nalezeno {2}." -#: ../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 "Začínám nahrávat s jedním požadavkem na objekt ..." -#: ../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 "{0}% ({1}/{2}), {3} zbývát. Nahrávám uzel ''{4}'' (id: {5})" -#: ../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 "{0}% ({1}/{2}), {3} zbývát. Nahrávám cestu ''{4}'' (id: {5})" -#: ../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 "{0}% ({1}/{2}), {3} zbývát. Nahrávám relaci ''{4}'' (id: {5})" -#: ../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 "Začínám nahrávat vše v jednom požadavku ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#, fuzzy, java-format +msgid "Value >0 expected for parameter ''{0}'', got {1}" +msgstr "neočekávaná hodnota parametru \"index\". Zadáno {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 +#, fuzzy +msgid "Starting to upload in chunks..." +msgstr "Začínám nahrávat vše v jednom požadavku ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#, fuzzy, java-format +msgid "({0}/{1}) Uploading {2} objects..." +msgstr "Nahrávám {0} objektů ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "Nahrávám data na serevr ..." - -#: ../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 "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10652,17 +11138,27 @@ msgstr "Stahuji Plugin {0}..." -#: ../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 "Smazat {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Chyba při mazání souboru pluginu: {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 msgid "Skip download" msgstr "Přeskočit stahování" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Download Plugin" msgstr "Stáhnout Plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Skip Download" msgstr "Přeskočit stahování" -#: ../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}." @@ -10674,16 +11170,15 @@ msgstr "Nastala chyba v pluginu {0}" -#: ../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 "Požadováno nahrání pluginu {0}. Tento plugin není již nadále třeba." - -#: ../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?" +"developed and very likely will produce errors.
It should be disabled." +"
Delete from preferences?" msgstr "" "Požadováno nahrání pluginu {0}.
Vývoj tohoto pluginu byl ukončen a " @@ -10691,5 +11186,5 @@ "jej smazat z konfigurace?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 msgid "" "You updated your JOSM software.\n" @@ -10701,50 +11196,50 @@ "Aktualizovat pluginy nyní?" -#: ../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 "Pluginy byly naposledy aktualizovány před {0} dny." -#: ../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 "Aktualizace pluginů" -#: ../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 "Plugin {0} požaduje aktualizaci JOSM na verzi {1}." -#: ../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 "Plugin {0} je požadován pluginem {1}, ale nebyl nalezen." -#: ../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 "Následující plugin nenalezen:{0}." -#: ../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 "Nemohu nahrát plugin {0}. Odstranit z nastavení?" -#: ../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 "Zakázat plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Keep plugin" msgstr "Ponechat plugin" -#: ../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 " @@ -10754,9 +11249,9 @@ "jejich přepsání." -#: ../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 "" @@ -10765,10 +11260,10 @@ "Nastala neočekávaná výjimka, která by mohla pocházet z pluginu ''{0}''." -#: ../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 "Dle informací z pluginu je autor {0}." -#: ../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." @@ -10776,9 +11271,9 @@ "Zkuste aktualizovat na nejnovější verzi tohoto pluginu, než ohlásíte chybu." -#: ../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 "Chcete plugin zakázat ?" -#: ../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 " @@ -10788,13 +11283,13 @@ "programu." -#: ../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 "Plugin nelze odstranit. Pravděpodobně je již neaktivní." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:386 msgid "Plugin information" msgstr "Informace o pluginu" -#: ../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" @@ -10914,6 +11409,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 "" @@ -10951,10 +11446,10 @@ 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 "" "Aktualizace na server selhala, protože vaše " -"aktuální
datová sada nesplňuje předpoklad.
Chybová zpráva " -"je:
{0}" +"aktuální
datová sada nesplňuje předpoklad.
Chybová zpráva je:
{0}" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 @@ -11019,7 +11514,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 "" @@ -11031,7 +11525,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 "" @@ -11066,6 +11560,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 "" @@ -11323,5 +11817,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" @@ -11336,12 +11830,10 @@ msgstr "Definovat interpolaci adres" -#. 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 "Liché" -#: ../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 @@ -11349,454 +11841,145 @@ msgstr "Sudé" -#: ../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 "Abecedně" -#: ../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 "Číslo" + +#. 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 "přírodní" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "místo" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Půjčovna" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 #, java-format msgid "Relation: {0}" msgstr "Relace: {0}" -#: ../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 "Přiřadit k ulici pomocí:" -#: ../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 "Číslovací systém:" -#: ../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 "vnitřní část" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 msgid "Starting #:" msgstr "Počáteční #:" -#: ../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 "Konečné #:" -#: ../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 "Město:" -#: ../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 "Stát:" -#: ../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 "PSČ:" -#: ../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 "Země:" -#: ../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 "Úplná Adresa:" -#: ../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 "Volitelné informace:" -#: ../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 "Prosíme, vyberte interpolaci adres pro tuto ulici" -#: ../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 "Očekávána lichá čísla pro adresy" -#: ../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 "Očekávána sudá čísla pro adresy" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093 +#, fuzzy +msgid "Expected valid number for address increment" +msgstr "Očekávána lichá čísla pro adresy" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 msgid "Country code must be 2 letters" msgstr "Kód země musí mít 2 písmena" -#: ../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 "Zadejte platné číslo pro počáteční a koncovou adresu" -#: ../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 "Abecední adresy musí končit písmenem" -#: ../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 "Počáteční a koncové číslo musí být pro abecední adresy stejné" -#: ../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 "Počáteční písmeno musí být menší než koncové písmeno" -#: ../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 "Zadejte platné číslo pro počáteční adresu" -#: ../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 "Prosíme vložte platné číslo pro koncovou adresu" -#: ../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 "Počáteční číslo adresy musí být menší než koncové císlo" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "AgPifoJ - Geotagged pictures" -msgstr "AgPifoJ - obrázky s geoznačkami" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "Zobrazit geotagované fotografie" - -#: ../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 "Předchozí" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Odebrat fotografii z vrstvy" - -#: ../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 "Další" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "Centrovat pohled" - -#: ../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 "" -"\n" -"Výška: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/h" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "Extrahovat pozice GPS z EXIFu" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121 -msgid "Starting directory scan" -msgstr "Začínam prohledávat adresář" - -#: ../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 "Načíst fotografie..." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:186 -#, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "Nemohu najít výchozí cesto pro adresář {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "Prohledávám adresář {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "Nalezen nulový soubor v adresáři {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Chyba při získávání souborů z adresáře {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "Korelovat vůči GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "Bylo nalezeno {0} fotografií s GPS tagem." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "Otevřít obrázky s AgPifoJ..." - -#: ../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 "Otevřít skupinu obrázků jako novou vrstvu." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "Soubory GPX (*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "Soubor {0} je načten pod jménem \"{1}\"" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#, java-format -msgid "Error while parsing {0}" -msgstr "Chyba při parsování {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Nemůžu číst \"{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 "" -"Vyfotografujte váš GPS přijímač když ukazuje čas.
Zobrazte zde jeho " -"fotografii.
Poté zapište čas zobrazený na fotografii a vyberte časové " -"pásmo
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Čas fotografie (z exif):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "Čas GPS (načten z předchozích fotografií): " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [dd/mm/rrrr hh:mm:ss]" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 -msgid "I'm in the timezone of: " -msgstr "Jsem v časovém pásmu: " - -#: ../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 "Žádné datum" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "Otevřít další fotografie" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 -msgid "Synchronize time from a photo of the GPS receiver" -msgstr "Synchronizovat čas z fotografie GPS přijímače" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"Chyba při čtení data.\n" -"Prosíme, použijte požadvaný formát" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "Neplatné datum" - -#: ../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 "GPX trasa: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Otevřít jinou GPX trasu" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -msgid "Timezone: " -msgstr "Časové pásmo: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 -msgid "Offset:" -msgstr "Posun:" - -#: ../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 "Mohu vyfotit můj GPS přijímač.
Může to pomoci?" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Aktualizovat pozici pro: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Všechny obrázky" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Obrázky bez exif pozice" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Neotagované obrázky" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 -msgid "Correlate images with GPX track" -msgstr "Korelovat obrázky s GPX trasou" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Correlate" -msgstr "Korelovat" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Auto-odhad" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "Měli byste vybrat GPX trasu" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Není vybrána GPX trasa" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Chyba při čtení časového pásma.\n" -"Očekávaný formát: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Nepatné časové pásmo" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Chyba při čtení posunutí.\n" -"Očekávaný formát: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Neplatný posun" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Nalezeno {0} shod s {1} v GPX trase {2}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "Nahrána GPX trasa" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "Zvolené fotografie neobsahují informace o čase." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Fotografie neobsahují informace o čase" - -#: ../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 "Zvolená GPX trasa neobsahuje časové údaje. Zvolte, prosím, jinou." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX trasa neobsahuje časové údaje" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Časová zóna: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minuty: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Sekundy: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "{0} z {1} fotografií bylo dosazeno do GPX trasy." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Časový rozdíl {0} dnů)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Posun mezi trasou a fotografiemi: {0}m {1}s" - -#: ../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 "Dosazení fotografií do trasy selhalo." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Upravit časovou zónu a posun" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Výchozí hodnoty" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433 -msgid "No image" -msgstr "Žádný obrázek." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "Nahrávám {0}" - -#: ../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 "Chyba v souboru {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11946,11 +12129,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 "" @@ -12248,6 +12430,6 @@ "known by www.cadastre.gouv.fr ." msgstr "" -"Vložte název města nebo obce.
Použijte syntax a interpunkci dle " -"www.cadastre.gouv.fr ." +"Vložte název města nebo obce.
Použijte syntax a interpunkci dle www." +"cadastre.gouv.fr ." #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:61 @@ -12270,13 +12452,4 @@ msgid "Export as PNG format (only raster images)" msgstr "Exportovat v PNG formátu (pouze rastrové obrázky)" - -#: ../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] "Zjednodušení cesty (odstranění {0} uzlu)" -msgstr[1] "Zjednodušení cesty (odstranění {0} uzlů)" -msgstr[2] "Zjednodušení cesty (odstranění {0} uzlů)" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 @@ -12394,14 +12567,14 @@ msgstr "Schémata barev" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 +#: ../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 "Rozdělit oblast" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 msgid "Splits an area by an untagged way." msgstr "Rozdělit oblast pomocí neotagované cesty" -#: ../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 " @@ -12714,4 +12887,8 @@ msgstr "Otevře obrázek s ImageWayPoint" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Otevřít skupinu obrázků jako novou vrstvu." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -12755,18 +12932,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 "Spouštím redukci vertexů..." -#: ../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 "Spouštím aproximaci Douglas-Peucker..." -#: ../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 "Odstraňuji duplicitní uzly..." -#: ../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" @@ -12815,7 +12992,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12825,5 +13002,5 @@ #. 50000 #. -#. +#. #. #. @@ -12833,5 +13010,5 @@ #. 50000 #. -#. +#. #. #. @@ -12840,5 +13017,5 @@ #. 50000 #. -#. +#. #. #. @@ -12848,5 +13025,5 @@ #. 50000 #. -#. +#. #. #. @@ -12924,8 +13101,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "" -"Maximum number of segments allowed in each generated way. Default 250." -msgstr "" -"Maximální počet úseků v každé vygenerované cestě. Výchozí hodnota 250." +msgid "Maximum number of segments allowed in each generated way. Default 250." +msgstr "Maximální počet úseků v každé vygenerované cestě. Výchozí hodnota 250." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70 @@ -12945,11 +13120,10 @@ #: ../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 " +"Accuracy of Douglas-Peucker line simplification, measured in degrees." +"
Lower values give more nodes, and more accurate lines. Default 0.0003." +msgstr "" +"Přesnost Douglas-Peuckerova generalizace linie, hodnota ve stupních." +"
Nižší hodnoty vracejí více uzlů s menším zjednodušením. Výchozí hodnota " "0.0003." -msgstr "" -"Přesnost Douglas-Peuckerova generalizace linie, hodnota ve " -"stupních.
Nižší hodnoty vracejí více uzlů s menším zjednodušením. Výchozí " -"hodnota 0.0003." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 @@ -12962,6 +13136,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74 msgid "Size of one landsat tile, measured in pixels. Default 2000." -msgstr "" -"Velikost jedné dlaždice z Landsatu, v pixelech. Výchozí hodnota 2000." +msgstr "Velikost jedné dlaždice z Landsatu, v pixelech. Výchozí hodnota 2000." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75 @@ -13018,20 +13191,19 @@ msgstr "Nemohu získat obrázek" -#: ../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 "Navazuji spojení" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Připojeno" -#. 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 "Nepřipojeno" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "Připojení selhalo" @@ -13253,6 +13425,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 "" "Hlavička obsahuje několik hodnot a nelze ji mapovat do jednoduchého řetězce" @@ -13338,9 +13509,10 @@ msgstr "Neznámá koncovka souboru: {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 "Osmarender" -#: ../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 " @@ -13350,9 +13522,5 @@ "mapy v nastavení." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "nastavení osmarenderu" - -#: ../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 "Spustitelný soubor Firefoxu" @@ -13732,17 +13900,17 @@ msgstr "Je třeba zadat zdroje předvoleb v konfiguraci." -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" msgstr "Obrátit řadu domů" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37 msgid "Reverses house numbers on a terrace." msgstr "Obrátit domovní čísla na řadě domů" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 msgid "Reverse a Terrace" msgstr "Obrátit řadu domů" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110 msgid "Reverse Terrace" msgstr "Obrátit řadu domů" @@ -13786,166 +13954,4 @@ msgid "Optional" msgstr "Volitelné" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "Spojit překrývající se plochy" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Joins areas that overlap each other" -msgstr "Spojí plochy, které se navzájem překrývají" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 -msgid "Only up to two areas can be joined at the moment." -msgstr "Aktuálně lze sloučit maximálně pouze dvě plochy." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 -#, java-format -msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "\"{0}\" není uzavřená plocha a tedy nelze spojit." - -#: ../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 "" -"Zvolené cesty mají uzly mimo hranice stažené oblasti.\n" -"Toto může vést k nechtěnému smazání používaných uzlů.\n" -"Opravdu chcete pokračovat?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 -msgid "Please abort if you are not sure" -msgstr "Prosíme přerušte, pokud si nejste jisti" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 -msgid "Please select at least one closed way the should be joined." -msgstr "Vyberte alespoň jednu uzavřenou cestu k připojení." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175 -msgid "No intersection found. Nothing was changed." -msgstr "Nenalezen žádný průnik. Nic se nemění." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197 -msgid "Added node on all intersections" -msgstr "Přidány body na všechny průsečíky" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221 -msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "Smazat cesty, které nejsou součástí vnižního multipolygonu." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226 -msgid "Fix relations" -msgstr "Opravit relace." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 -msgid "Joined self-overlapping area" -msgstr "Spojena plocha překrývající sama sebe" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 -msgid "Joined overlapping areas" -msgstr "Spojeny překrývající se plochy" - -#: ../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 "" -"Některé z cest byly prvky relací, které byly změněny. Prosíme, ověřte, zda " -"tímto nedošlo ke vzniku chyb." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 -msgid "Enter values for all conflicts." -msgstr "Zadej hodnoty pro všechny konflikty" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Vyřešit konflikty" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312 -msgid "Fix tag conflicts" -msgstr "Opravit konflikty značek" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462 -msgid "Removed Element from Relations" -msgstr "Prvek odstraněn z relací" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571 -msgid "Join Areas: Remove Short Ways" -msgstr "Spojit plochy: Vymazat krátké cesty" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587 -msgid "Closed Way" -msgstr "Uzavřená cesta" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854 -msgid "Remove tags from inner ways" -msgstr "Odstranit tagy z vnitřních cest" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883 -msgid "Join Areas Function" -msgstr "Funkce spojení ploch" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Jump To Position" -msgstr "Skok na pozici" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Opens a dialog that allows to jump to a specific location" -msgstr "Otevře dialog umožňující skočit na zadané místo" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 -msgid "Enter Lat/Lon to jump to position." -msgstr "Zadejte šířku/délku místa kam skočit." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 -msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "Můžete též vložit URL z www.openstreetmap.org" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 -msgid "Zoom (in metres)" -msgstr "Přiblížení (v metrech)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -msgid "Jump there" -msgstr "Skočit tam" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 -msgid "Jump to Position" -msgstr "Skok na místo" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Could not parse Latitude, Longitude or Zoom. Please check." -msgstr "Nelze rozpoznat šířku, délku nebo přiblížení. Prosím, zkontrolujte." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Unable to parse Lon/Lat" -msgstr "Nelze rozpoznat šířku/délku" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Simplify Way" -msgstr "Zjednodušit cestu" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Smazat nepotřebné uzly z cesty." - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "Vyberte alespoň jednu cestu k zjednodušení." - -#: ../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] "Výběr obsahuje {0} cestu. Opravdu ji chcete zjednodušit?" -msgstr[1] "Výběr obsahuje {0} cesty. Opravdu je chcete všechny zjednodušit?" -msgstr[2] "Výběr obsahuje {0} cest. Opravdu je chcete všechny zjednodušit?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "Jste si jist?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14010,6 +14016,5 @@ "An OSM data validator that checks for common errors made by users and editor " "programs." -msgstr "" -"Kontrolor OSM dat, hledající běžné chyby udělané uživateli a programy." +msgstr "Kontrolor OSM dat, hledající běžné chyby udělané uživateli a programy." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99 @@ -14044,5 +14049,5 @@ msgstr "ostatní kontroly" -#: ../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}" @@ -14095,34 +14100,34 @@ msgstr "Ignorovat zvolené chyby pro příště." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Celá skupina" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Jednotlivé prvky" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Nic" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Ignorovat celou skupinu, nebo jednotlivé prvky?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 msgid "Ignoring elements" msgstr "Ignoruji elementy" -#: ../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 "Opravuji chyby ..." -#: ../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 "Opravuji ({0}/{1}): ''{2}''" -#: ../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 "Aktualizuji mapu ..." @@ -14171,19 +14176,18 @@ msgstr "Zkřížené cesty" -#: ../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 "Duplicitní uzly" -#: ../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 "" -"Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici." - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82 +msgstr "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:68 msgid "Nodes at same position" msgstr "Uzly na stejné pozici" -#: ../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 "Potvrzení" @@ -14306,6 +14310,5 @@ msgid "" "This test checks for ways with similar names that may have been misspelled." -msgstr "" -"Tento test kontroluje cesty na podobnost jmen, kdy může jít o překlep." +msgstr "Tento test kontroluje cesty na podobnost jmen, kdy může jít o překlep." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 @@ -14421,7 +14424,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 "" @@ -14566,5 +14568,5 @@ #. 50000 #. -#. +#. #. #. @@ -14572,5 +14574,5 @@ #. #. -#. +#. #. #. @@ -14580,5 +14582,5 @@ #. 50000 #. -#. +#. #. #. @@ -14587,5 +14589,5 @@ #. 50000 #. -#. +#. #. #. @@ -14594,5 +14596,5 @@ #. 50000 #. -#. +#. #. #. @@ -14601,5 +14603,5 @@ #. 50000 #. -#. +#. #. #. @@ -14608,5 +14610,5 @@ #. 50000 #. -#. +#. #. #. @@ -14615,9 +14617,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14662,5 +14664,5 @@ #. 50000 #. -#. +#. #. #. @@ -14705,6 +14707,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38 msgid "This test checks for untagged nodes that are not part of any way." -msgstr "" -"Tento test hledá neotagované uzly, které nejsou součástí žádné cesty." +msgstr "Tento test hledá neotagované uzly, které nejsou součástí žádné cesty." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59 @@ -14794,14 +14795,14 @@ msgstr "Walking Papers" -#: ../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 " @@ -14810,14 +14811,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 "" @@ -14826,5 +14827,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 "" @@ -14836,13 +14837,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." @@ -14999,50 +15000,50 @@ "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "Nahrát viditelné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "Změnit rozlišení" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Reload erroneous tiles" msgstr "Znovu nahrát chybné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:369 msgid "Save WMS layer to file" msgstr "Uložit WMS vrstvu do souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "Uložit WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "Nahrát WMS vrstvu ze souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "Načíst vrstvu WMS" -#: ../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 "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "File Format Error" msgstr "Chyba formátu souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "Chyba při nahrávání souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -15118,5 +15119,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 "" @@ -15158,21 +15159,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 " @@ -15188,10 +15184,10 @@ #. Plugin Create_grid_of_ways -#: build/trans_plugins.java:11 +#: build/trans_plugins.java:9 msgid "Create a grid of ways." msgstr "Plugin Vytvořit pravidelné sítě cest" #. Plugin czechaddress -#: build/trans_plugins.java:13 +#: build/trans_plugins.java:11 msgid "" "Creating and handling address nodes and buildings within Czech Republic." @@ -15199,24 +15195,24 @@ #. Plugin dataimport -#: build/trans_plugins.java:15 +#: build/trans_plugins.java:13 msgid "Allows to import various file formats into JOSM directly." msgstr "Umožňuje importovat rozličné formáty souborů přímo do JOSM." #. Plugin DirectUpload -#: build/trans_plugins.java:17 +#: build/trans_plugins.java:15 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " "openstreetmap.org." msgstr "" -"Tento plugin přímo nahrává GPS trasy z aktivní vrstvy JOSM na " -"openstreetmap.org." +"Tento plugin přímo nahrává GPS trasy z aktivní vrstvy JOSM na openstreetmap." +"org." #. Plugin Duplicate-Way -#: build/trans_plugins.java:19 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "Plugin Duplikovat_cestu" #. Plugin editgpx -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -15227,21 +15223,20 @@ #. Plugin globalsat +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." +msgstr "Stahuje GPS body z Globalsat dg100 data loggeru přímo do JOSM." + +#. Plugin graphview #: build/trans_plugins.java:23 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." -msgstr "Stahuje GPS body z Globalsat dg100 data loggeru přímo do JOSM." - -#. Plugin graphview -#: build/trans_plugins.java:25 msgid "Visualizes routing information as a routing graph." msgstr "Vizualizuje informace o směrování v podobě grafu." #. Plugin grid -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Poskytuje vrstvu na pozadí zobrazující mřížku mapy" #. Plugin ImageWayPoint -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -15251,5 +15246,5 @@ #. Plugin lakewalker -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" @@ -15258,12 +15253,12 @@ #. Plugin livegps +#: build/trans_plugins.java:31 +msgid "" +"Support live GPS input (moving dot) through a connection to gpsd server." +msgstr "" +"Poskytuje živý GPS vstup (pohybující se bod). Připojuje se k serveru gpsd." + +#. Plugin measurement #: build/trans_plugins.java:33 -msgid "" -"Support live GPS input (moving dot) through a connection to gpsd server." -msgstr "" -"Poskytuje živý GPS vstup (pohybující se bod). Připojuje se k serveru gpsd." - -#. Plugin measurement -#: build/trans_plugins.java:35 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -15276,10 +15271,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 " @@ -15290,5 +15285,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 " @@ -15301,29 +15296,29 @@ #. Plugin openlayers -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:41 msgid "Displays an OpenLayers background image" msgstr "Zobrazuje na pozadí obrázek z OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:43 msgid "Imports issues from OpenStreetBugs" msgstr "Importuje problémy z OpenStreetBugs." #. Plugin openvisible +#: build/trans_plugins.java:45 +msgid "" +"Allows opening gpx/osm files that intersect the currently visible screen area" +msgstr "" +"Otevírá sobory gpx/osm které se protínají se současnou viditelnou oblastí." + +#. Plugin osmarender #: build/trans_plugins.java:47 msgid "" -"Allows opening gpx/osm files that intersect the currently visible screen area" -msgstr "" -"Otevírá sobory gpx/osm které se protínají se současnou viditelnou oblastí." - -#. Plugin osmarender +"Launches FireFox to display the current visible screen as a nice SVG image." +msgstr "" +"Otevřít Firefox a zobrazit pravě viditelnou obrazovku jako SVG obrázek." + +#. Plugin PicLayer #: build/trans_plugins.java:49 -msgid "" -"Launches FireFox to display the current visible screen as a nice SVG image." -msgstr "" -"Otevřít Firefox a zobrazit pravě viditelnou obrazovku jako SVG obrázek." - -#. Plugin PicLayer -#: build/trans_plugins.java:51 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -15334,15 +15329,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:51 msgid "The great JGoodies Plastic Look and Feel." msgstr "Ohromný JGoodies Plastic Look and Feel." #. Plugin remotecontrol -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:53 msgid "Let other applications send commands to JOSM." msgstr "Umožní jiné aplikace posílat příkazy do JOSM." #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15353,10 +15348,10 @@ #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:57 msgid "Provides routing capabilities." msgstr "Poskytuje směrování" #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:59 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -15367,15 +15362,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:61 msgid "Allow adding markers/nodes on current gps positions." msgstr "Umožní přidat ukazatele/body na současnou GPS polohu." #. Plugin tageditor -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:63 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Poskytuje dialog umožňující editovat tagy v tabulce." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:65 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -15385,19 +15380,10 @@ #. Plugin terracer -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:67 msgid "Make terraced houses out of single blocks." msgstr "Vytváření řadových domků z jednotlivých bloků." -#. 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 "" -"Několik nástrojů pro jednodužší život: např. zjednodušení cest, spojení " -"ploch, skok na pozici." - #. Plugin validator -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -15408,5 +15394,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15417,10 +15403,10 @@ #. Plugin waydownloader -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "Snadné stahovaní velmi dlouhých propojených cest" #. Plugin wmsplugin -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -16474,8 +16460,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16672,5 +16658,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16680,5 +16666,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16697,5 +16683,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16705,5 +16691,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16722,5 +16708,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16730,5 +16716,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16747,5 +16733,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16755,5 +16741,5 @@ #. 300000 #. -#. +#. #. #. @@ -16768,5 +16754,5 @@ #. 300000 #. -#. +#. #. #. @@ -16784,5 +16770,5 @@ #. 50000 #. -#. +#. #. #. @@ -16800,5 +16786,5 @@ #. 40000 #. -#. +#. #. #. @@ -16807,5 +16793,5 @@ #. 40000 #. -#. +#. #. #. @@ -16815,5 +16801,5 @@ #. 50000 #. -#. +#. #. #. @@ -16833,5 +16819,5 @@ #. 50000 #. -#. +#. #. #. @@ -16840,5 +16826,5 @@ #. 50000 #. -#. +#. #. #. @@ -16848,5 +16834,5 @@ #. 50000 #. -#. +#. #. #. @@ -16896,7 +16882,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17336,6 +17322,5 @@ #: build/trans_presets.java:789 build/trans_presets.java:804 msgid "pegasus" -msgstr "" -"pegas (se semafory a tlačítkem pro chodce, cyklisty a jezdce na koni)" +msgstr "pegas (se semafory a tlačítkem pro chodce, cyklisty a jezdce na koni)" #: build/trans_presets.java:789 build/trans_presets.java:804 @@ -17596,5 +17581,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17633,5 +17618,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17727,5 +17712,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17882,5 +17867,5 @@ #. 50000 #. -#. +#. #. #. @@ -19267,5 +19252,5 @@ #. 30000 #. -#. +#. #. #. @@ -19275,5 +19260,5 @@ #. 40000 #. -#. +#. #. #. @@ -19283,5 +19268,5 @@ #. 20000 #. -#. +#. #. #. @@ -19291,5 +19276,5 @@ #. 40000 #. -#. +#. #. #. @@ -19647,7 +19632,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19657,5 +19642,5 @@ #. 50000 #. -#. +#. #. #. @@ -19665,5 +19650,5 @@ #. 50000 #. -#. +#. #. #. @@ -19673,5 +19658,5 @@ #. 50000 #. -#. +#. #. #. @@ -19681,5 +19666,5 @@ #. 50000 #. -#. +#. #. #. @@ -19689,5 +19674,5 @@ #. 50000 #. -#. +#. #. #. @@ -19697,5 +19682,5 @@ #. 50000 #. -#. +#. #. #. @@ -19705,5 +19690,5 @@ #. 50000 #. -#. +#. #. #. @@ -19713,5 +19698,5 @@ #. 50000 #. -#. +#. #. #. @@ -19721,5 +19706,5 @@ #. 50000 #. -#. +#. #. #. @@ -19729,5 +19714,5 @@ #. 50000 #. -#. +#. #. #. @@ -19737,5 +19722,5 @@ #. 50000 #. -#. +#. #. #. @@ -19745,5 +19730,5 @@ #. 50000 #. -#. +#. #. #. @@ -19753,5 +19738,5 @@ #. 50000 #. -#. +#. #. #. @@ -19761,5 +19746,5 @@ #. 50000 #. -#. +#. #. #. @@ -19769,5 +19754,5 @@ #. 50000 #. -#. +#. #. #. @@ -19777,5 +19762,5 @@ #. 50000 #. -#. +#. #. #. @@ -19785,5 +19770,5 @@ #. 50000 #. -#. +#. #. #. @@ -19793,5 +19778,5 @@ #. 50000 #. -#. +#. #. #. @@ -19801,5 +19786,5 @@ #. 50000 #. -#. +#. #. #. @@ -19809,5 +19794,5 @@ #. 50000 #. -#. +#. #. #. @@ -19817,5 +19802,5 @@ #. 50000 #. -#. +#. #. #. @@ -19825,5 +19810,5 @@ #. 50000 #. -#. +#. #. #. @@ -19833,5 +19818,5 @@ #. 50000 #. -#. +#. #. #. @@ -19841,5 +19826,5 @@ #. 50000 #. -#. +#. #. #. @@ -19849,5 +19834,5 @@ #. 50000 #. -#. +#. #. #. @@ -19857,5 +19842,5 @@ #. 50000 #. -#. +#. #. #. @@ -19865,5 +19850,5 @@ #. 50000 #. -#. +#. #. #. @@ -19873,5 +19858,5 @@ #. 50000 #. -#. +#. #. #. @@ -19881,5 +19866,5 @@ #. 50000 #. -#. +#. #. #. @@ -19889,5 +19874,5 @@ #. 50000 #. -#. +#. #. #. @@ -19897,5 +19882,5 @@ #. 50000 #. -#. +#. #. #. @@ -19905,5 +19890,5 @@ #. 50000 #. -#. +#. #. #. @@ -19913,5 +19898,5 @@ #. 50000 #. -#. +#. #. #. @@ -19921,5 +19906,5 @@ #. 50000 #. -#. +#. #. #. @@ -19929,5 +19914,5 @@ #. 50000 #. -#. +#. #. #. @@ -19937,5 +19922,5 @@ #. 50000 #. -#. +#. #. #. @@ -19945,5 +19930,5 @@ #. 50000 #. -#. +#. #. #. @@ -19953,5 +19938,5 @@ #. 50000 #. -#. +#. #. #. @@ -19961,5 +19946,5 @@ #. 50000 #. -#. +#. #. #. @@ -19969,5 +19954,5 @@ #. 50000 #. -#. +#. #. #. @@ -19977,5 +19962,5 @@ #. 50000 #. -#. +#. #. #. @@ -19985,5 +19970,5 @@ #. 50000 #. -#. +#. #. #. @@ -19993,5 +19978,5 @@ #. 50000 #. -#. +#. #. #. @@ -20001,5 +19986,5 @@ #. 50000 #. -#. +#. #. #. @@ -20009,5 +19994,5 @@ #. 50000 #. -#. +#. #. #. @@ -20017,5 +20002,5 @@ #. 50000 #. -#. +#. #. #. @@ -21709,7 +21694,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21719,5 +21704,5 @@ #. 50000 #. -#. +#. #. #. @@ -21727,5 +21712,5 @@ #. 50000 #. -#. +#. #. #. @@ -21735,5 +21720,5 @@ #. 50000 #. -#. +#. #. #. @@ -21743,5 +21728,5 @@ #. 50000 #. -#. +#. #. #. @@ -21751,5 +21736,5 @@ #. 50000 #. -#. +#. #. #. @@ -21759,5 +21744,5 @@ #. 50000 #. -#. +#. #. #. @@ -21767,5 +21752,5 @@ #. 50000 #. -#. +#. #. #. @@ -23096,5 +23081,5 @@ #. 40000 #. -#. +#. #. #. @@ -23110,5 +23095,5 @@ #. 30000 #. -#. +#. #. #. @@ -23119,7 +23104,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23129,5 +23114,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -23137,13 +23130,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -23153,5 +23138,5 @@ #. 50000 #. -#. +#. #. #. @@ -23184,5 +23169,5 @@ #. 50000 #. -#. +#. #. #. @@ -23198,5 +23183,5 @@ #. 50000 #. -#. +#. #. #. @@ -23206,5 +23191,5 @@ #. 10000 #. -#. +#. #. #. @@ -23214,5 +23199,5 @@ #. 10000 #. -#. +#. #. #. @@ -23223,5 +23208,5 @@ #. 10000 #. -#. +#. #. #. @@ -23250,5 +23235,5 @@ #. 50000 #. -#. +#. #. #. @@ -23363,9 +23348,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 @@ -23373,5 +23358,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, @@ -23381,8 +23366,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 @@ -23396,5 +23381,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23402,5 +23387,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23449,6 +23434,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23528,5 +23513,5 @@ #. 40000 #. -#. +#. #. #. @@ -23536,5 +23521,5 @@ #. 10000 #. -#. +#. #. #. @@ -23543,5 +23528,5 @@ #. 50000 #. -#. +#. #. #. @@ -23551,5 +23536,5 @@ #. 50000 #. -#. +#. #. #. @@ -23558,5 +23543,5 @@ #. 50000 #. -#. +#. #. #. @@ -23565,5 +23550,5 @@ #. 50000 #. -#. +#. #. #. @@ -23572,5 +23557,5 @@ #. 50000 #. -#. +#. #. #. @@ -23579,5 +23564,5 @@ #. 50000 #. -#. +#. #. #. @@ -23586,5 +23571,5 @@ #. 40000 #. -#. +#. #. #. @@ -23593,5 +23578,5 @@ #. 50000 #. -#. +#. #. #. @@ -23600,5 +23585,5 @@ #. 50000 #. -#. +#. #. #. @@ -23607,5 +23592,5 @@ #. 50000 #. -#. +#. #. #. @@ -23614,5 +23599,5 @@ #. 50000 #. -#. +#. #. #. @@ -23621,5 +23606,5 @@ #. 50000 #. -#. +#. #. #. @@ -23628,5 +23613,5 @@ #. 50000 #. -#. +#. #. #. @@ -23636,5 +23621,5 @@ #. 50000 #. -#. +#. #. #. @@ -23643,5 +23628,5 @@ #. 50000 #. -#. +#. #. #. @@ -23652,5 +23637,5 @@ #. 50000 #. -#. +#. #. #. @@ -23662,11 +23647,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23675,7 +23660,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23686,5 +23671,5 @@ #. 50000 #. -#. +#. #. #. @@ -23695,5 +23680,5 @@ #. 50000 #. -#. +#. #. #. @@ -23704,5 +23689,5 @@ #. 50000 #. -#. +#. #. #. @@ -23713,5 +23698,5 @@ #. 50000 #. -#. +#. #. #. @@ -23722,5 +23707,5 @@ #. 50000 #. -#. +#. #. #. @@ -23731,5 +23716,5 @@ #. 40000 #. -#. +#. #. #. @@ -23741,5 +23726,5 @@ #. 50000 #. -#. +#. #. #. @@ -23750,5 +23735,5 @@ #. 50000 #. -#. +#. #. #. @@ -23773,5 +23758,5 @@ #. 10000 #. -#. +#. #. #. @@ -23780,5 +23765,5 @@ #. 50000 #. -#. +#. #. #. @@ -23787,5 +23772,5 @@ #. 50000 #. -#. +#. #. #. @@ -23801,5 +23786,5 @@ #. 20000 #. -#. +#. #. #. @@ -23813,5 +23798,5 @@ #. 30000 #. -#. +#. #. #. @@ -23820,5 +23805,5 @@ #. 50000 #. -#. +#. #. #. @@ -23827,5 +23812,5 @@ #. 50000 #. -#. +#. #. #. @@ -23834,5 +23819,5 @@ #. 50000 #. -#. +#. #. #. @@ -23841,5 +23826,5 @@ #. 50000 #. -#. +#. #. #. @@ -23848,5 +23833,5 @@ #. 50000 #. -#. +#. #. #. @@ -23855,5 +23840,5 @@ #. 50000 #. -#. +#. #. #. @@ -23862,5 +23847,5 @@ #. 50000 #. -#. +#. #. #. @@ -23869,5 +23854,5 @@ #. 50000 #. -#. +#. #. #. @@ -23876,5 +23861,5 @@ #. 50000 #. -#. +#. #. #. @@ -23883,5 +23868,5 @@ #. 50000 #. -#. +#. #. #. @@ -23890,5 +23875,5 @@ #. 50000 #. -#. +#. #. #. @@ -23897,5 +23882,5 @@ #. 50000 #. -#. +#. #. #. @@ -23904,5 +23889,5 @@ #. 50000 #. -#. +#. #. #. @@ -23911,5 +23896,5 @@ #. 50000 #. -#. +#. #. #. @@ -24080,7 +24065,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24094,5 +24079,5 @@ #. 40000 #. -#. +#. #. #. @@ -24102,7 +24087,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24112,5 +24097,5 @@ #. 50000 #. -#. +#. #. #. @@ -24120,5 +24105,5 @@ #. 50000 #. -#. +#. #. #. @@ -24128,5 +24113,5 @@ #. 50000 #. -#. +#. #. #. @@ -24136,5 +24121,5 @@ #. 50000 #. -#. +#. #. #. @@ -24150,5 +24135,5 @@ #. 10000 #. -#. +#. #. #. @@ -24158,5 +24143,5 @@ #. 50000 #. -#. +#. #. #. @@ -24166,5 +24151,5 @@ #. 50000 #. -#. +#. #. #. @@ -24174,5 +24159,5 @@ #. 50000 #. -#. +#. #. #. @@ -24182,5 +24167,5 @@ #. 50000 #. -#. +#. #. #. @@ -24190,5 +24175,5 @@ #. 50000 #. -#. +#. #. #. @@ -24198,5 +24183,5 @@ #. 50000 #. -#. +#. #. #. @@ -24215,5 +24200,5 @@ #. 50000 #. -#. +#. #. #. @@ -24222,5 +24207,5 @@ #. 50000 #. -#. +#. #. #. @@ -24234,5 +24219,5 @@ #. 50000 #. -#. +#. #. #. @@ -24246,5 +24231,5 @@ #. 50000 #. -#. +#. #. #. @@ -24253,5 +24238,5 @@ #. 50000 #. -#. +#. #. #. @@ -24265,5 +24250,5 @@ #. 50000 #. -#. +#. #. #. @@ -24278,5 +24263,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24291,5 +24276,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24303,5 +24288,5 @@ #. 50000 #. -#. +#. #. #. @@ -24315,5 +24300,5 @@ #. 50000 #. -#. +#. #. #. @@ -24322,5 +24307,5 @@ #. 50000 #. -#. +#. #. #. @@ -24329,5 +24314,5 @@ #. 50000 #. -#. +#. #. #. @@ -24341,5 +24326,5 @@ #. 50000 #. -#. +#. #. #. @@ -24349,5 +24334,5 @@ #. 50000 #. -#. +#. #. #. @@ -24356,5 +24341,5 @@ #. 50000 #. -#. +#. #. #. @@ -24363,5 +24348,5 @@ #. 50000 #. -#. +#. #. #. @@ -24370,5 +24355,5 @@ #. 50000 #. -#. +#. #. #. @@ -24378,5 +24363,5 @@ #. 50000 #. -#. +#. #. #. @@ -24387,5 +24372,5 @@ #. 50000 #. -#. +#. #. #. @@ -24395,7 +24380,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24405,5 +24390,5 @@ #. 50000 #. -#. +#. #. #. @@ -24413,5 +24398,5 @@ #. 50000 #. -#. +#. #. #. @@ -24421,5 +24406,5 @@ #. 50000 #. -#. +#. #. #. @@ -24430,5 +24415,5 @@ #. 50000 #. -#. +#. #. #. @@ -24438,5 +24423,5 @@ #. 50000 #. -#. +#. #. #. @@ -24446,5 +24431,5 @@ #. 50000 #. -#. +#. #. #. @@ -24454,5 +24439,5 @@ #. 50000 #. -#. +#. #. #. @@ -24462,5 +24447,5 @@ #. 50000 #. -#. +#. #. #. @@ -24470,5 +24455,5 @@ #. 50000 #. -#. +#. #. #. @@ -24478,5 +24463,5 @@ #. 50000 #. -#. +#. #. #. @@ -24486,5 +24471,5 @@ #. 50000 #. -#. +#. #. #. @@ -24494,5 +24479,5 @@ #. 50000 #. -#. +#. #. #. @@ -24515,7 +24500,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24525,5 +24510,5 @@ #. 50000 #. -#. +#. #. #. @@ -24532,5 +24517,5 @@ #. 50000 #. -#. +#. #. #. @@ -24540,5 +24525,5 @@ #. 50000 #. -#. +#. #. #. @@ -24547,5 +24532,5 @@ #. 50000 #. -#. +#. #. #. @@ -24555,5 +24540,5 @@ #. 50000 #. -#. +#. #. #. @@ -24563,5 +24548,5 @@ #. 50000 #. -#. +#. #. #. @@ -24577,5 +24562,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24586,5 +24571,5 @@ #. 50000 #. -#. +#. #. #. @@ -24603,5 +24588,5 @@ #. 50000 #. -#. +#. #. #. @@ -24611,5 +24596,5 @@ #. 50000 #. -#. +#. #. #. @@ -24622,5 +24607,5 @@ #. 50000 #. -#. +#. #. #. @@ -24638,5 +24623,5 @@ #. 50000 #. -#. +#. #. #. @@ -24645,5 +24630,5 @@ #. 50000 #. -#. +#. #. #. @@ -24652,5 +24637,5 @@ #. 50000 #. -#. +#. #. #. @@ -24659,7 +24644,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24670,5 +24655,5 @@ #. 50000 #. -#. +#. #. #. @@ -24683,5 +24668,5 @@ #. 50000 #. -#. +#. #. #. @@ -24695,5 +24680,5 @@ #. 50000 #. -#. +#. #. #. @@ -24703,5 +24688,5 @@ #. 50000 #. -#. +#. #. #. @@ -24715,5 +24700,5 @@ #. 50000 #. -#. +#. #. #. @@ -24727,5 +24712,5 @@ #. 50000 #. -#. +#. #. #. @@ -24734,7 +24719,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24744,5 +24729,5 @@ #. 50000 #. -#. +#. #. #. @@ -24752,5 +24737,5 @@ #. 50000 #. -#. +#. #. #. @@ -24760,5 +24745,5 @@ #. 50000 #. -#. +#. #. #. @@ -24768,5 +24753,5 @@ #. 50000 #. -#. +#. #. #. @@ -24782,7 +24767,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24797,5 +24782,5 @@ #. 30000 #. -#. +#. #. #. @@ -24810,5 +24795,5 @@ #. 30000 #. -#. +#. #. #. @@ -24823,5 +24808,5 @@ #. 30000 #. -#. +#. #. #. @@ -24836,5 +24821,5 @@ #. 30000 #. -#. +#. #. #. @@ -24849,5 +24834,5 @@ #. 30000 #. -#. +#. #. #. @@ -24862,7 +24847,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24872,5 +24857,5 @@ #. 50000 #. -#. +#. #. #. @@ -24879,5 +24864,5 @@ #. 50000 #. -#. +#. #. #. @@ -24887,5 +24872,5 @@ #. 50000 #. -#. +#. #. #. @@ -24895,5 +24880,5 @@ #. 50000 #. -#. +#. #. #. @@ -24903,5 +24888,5 @@ #. 50000 #. -#. +#. #. #. @@ -24911,5 +24896,5 @@ #. 50000 #. -#. +#. #. #. @@ -24919,5 +24904,5 @@ #. 50000 #. -#. +#. #. #. @@ -24927,5 +24912,5 @@ #. 50000 #. -#. +#. #. #. @@ -24935,5 +24920,5 @@ #. 50000 #. -#. +#. #. #. @@ -24943,5 +24928,5 @@ #. 50000 #. -#. +#. #. #. @@ -24951,5 +24936,5 @@ #. 50000 #. -#. +#. #. #. @@ -24959,5 +24944,5 @@ #. 50000 #. -#. +#. #. #. @@ -24967,5 +24952,5 @@ #. 50000 #. -#. +#. #. #. @@ -24985,5 +24970,5 @@ #. 50000 #. -#. +#. #. #. @@ -24998,5 +24983,5 @@ #. 50000 #. -#. +#. #. #. @@ -25009,7 +24994,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25019,5 +25004,5 @@ #. 50000 #. -#. +#. #. #. @@ -25027,5 +25012,5 @@ #. 50000 #. -#. +#. #. #. @@ -25035,5 +25020,5 @@ #. 50000 #. -#. +#. #. #. @@ -25043,5 +25028,5 @@ #. 50000 #. -#. +#. #. #. @@ -25051,5 +25036,5 @@ #. 50000 #. -#. +#. #. #. @@ -25059,5 +25044,5 @@ #. 50000 #. -#. +#. #. #. @@ -25067,5 +25052,5 @@ #. 50000 #. -#. +#. #. #. @@ -25075,5 +25060,5 @@ #. 50000 #. -#. +#. #. #. @@ -25083,5 +25068,5 @@ #. 50000 #. -#. +#. #. #. @@ -25091,5 +25076,5 @@ #. 50000 #. -#. +#. #. #. @@ -25099,5 +25084,5 @@ #. 50000 #. -#. +#. #. #. @@ -25107,5 +25092,5 @@ #. 50000 #. -#. +#. #. #. @@ -25115,5 +25100,5 @@ #. 50000 #. -#. +#. #. #. @@ -25123,5 +25108,5 @@ #. 50000 #. -#. +#. #. #. @@ -25142,5 +25127,5 @@ #. 50000 #. -#. +#. #. #. @@ -25154,7 +25139,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25164,5 +25149,5 @@ #. 50000 #. -#. +#. #. #. @@ -25172,5 +25157,5 @@ #. 50000 #. -#. +#. #. #. @@ -25180,5 +25165,5 @@ #. 50000 #. -#. +#. #. #. @@ -25188,5 +25173,5 @@ #. 50000 #. -#. +#. #. #. @@ -25196,5 +25181,5 @@ #. 50000 #. -#. +#. #. #. @@ -25204,5 +25189,5 @@ #. 50000 #. -#. +#. #. #. @@ -25212,5 +25197,5 @@ #. 50000 #. -#. +#. #. #. @@ -25227,5 +25212,5 @@ #. 50000 #. -#. +#. #. #. @@ -25235,5 +25220,5 @@ #. 50000 #. -#. +#. #. #. @@ -25243,5 +25228,5 @@ #. 50000 #. -#. +#. #. #. @@ -25251,5 +25236,5 @@ #. 50000 #. -#. +#. #. #. @@ -25259,5 +25244,5 @@ #. 50000 #. -#. +#. #. #. @@ -25267,5 +25252,5 @@ #. 50000 #. -#. +#. #. #. @@ -25275,5 +25260,5 @@ #. 50000 #. -#. +#. #. #. @@ -25283,5 +25268,5 @@ #. 50000 #. -#. +#. #. #. @@ -25291,5 +25276,5 @@ #. 50000 #. -#. +#. #. #. @@ -25299,5 +25284,5 @@ #. 50000 #. -#. +#. #. #. @@ -25307,5 +25292,5 @@ #. 50000 #. -#. +#. #. #. @@ -25315,5 +25300,5 @@ #. 50000 #. -#. +#. #. #. @@ -25332,5 +25317,5 @@ #. 50000 #. -#. +#. #. #. @@ -25340,5 +25325,5 @@ #. 50000 #. -#. +#. #. #. @@ -25347,5 +25332,5 @@ #. 50000 #. -#. +#. #. #. @@ -25355,5 +25340,5 @@ #. 50000 #. -#. +#. #. #. @@ -25363,5 +25348,5 @@ #. 50000 #. -#. +#. #. #. @@ -25371,5 +25356,5 @@ #. 50000 #. -#. +#. #. #. @@ -25378,5 +25363,5 @@ #. 50000 #. -#. +#. #. #. @@ -25386,5 +25371,5 @@ #. 50000 #. -#. +#. #. #. @@ -25394,5 +25379,5 @@ #. 50000 #. -#. +#. #. #. @@ -25402,5 +25387,5 @@ #. 50000 #. -#. +#. #. #. @@ -25410,5 +25395,5 @@ #. 50000 #. -#. +#. #. #. @@ -25417,5 +25402,5 @@ #. 50000 #. -#. +#. #. #. @@ -25424,5 +25409,5 @@ #. 50000 #. -#. +#. #. #. @@ -25431,5 +25416,5 @@ #. 50000 #. -#. +#. #. #. @@ -25438,5 +25423,5 @@ #. 50000 #. -#. +#. #. #. @@ -25445,5 +25430,5 @@ #. 50000 #. -#. +#. #. #. @@ -25452,5 +25437,5 @@ #. 50000 #. -#. +#. #. #. @@ -25459,5 +25444,5 @@ #. 50000 #. -#. +#. #. #. @@ -25466,5 +25451,5 @@ #. 50000 #. -#. +#. #. #. @@ -25473,5 +25458,5 @@ #. 50000 #. -#. +#. #. #. @@ -25480,5 +25465,5 @@ #. 50000 #. -#. +#. #. #. @@ -25487,5 +25472,5 @@ #. 50000 #. -#. +#. #. #. @@ -25494,5 +25479,5 @@ #. 50000 #. -#. +#. #. #. @@ -25501,5 +25486,5 @@ #. 50000 #. -#. +#. #. #. @@ -25509,5 +25494,5 @@ #. 50000 #. -#. +#. #. #. @@ -25517,5 +25502,5 @@ #. 50000 #. -#. +#. #. #. @@ -25525,5 +25510,5 @@ #. 50000 #. -#. +#. #. #. @@ -25533,5 +25518,5 @@ #. 50000 #. -#. +#. #. #. @@ -25541,5 +25526,5 @@ #. 50000 #. -#. +#. #. #. @@ -25549,5 +25534,5 @@ #. 50000 #. -#. +#. #. #. @@ -25557,5 +25542,5 @@ #. 50000 #. -#. +#. #. #. @@ -25565,5 +25550,5 @@ #. 50000 #. -#. +#. #. #. @@ -25573,5 +25558,5 @@ #. 50000 #. -#. +#. #. #. @@ -25582,5 +25567,5 @@ #. 50000 #. -#. +#. #. #. @@ -25590,5 +25575,5 @@ #. 50000 #. -#. +#. #. #. @@ -25598,5 +25583,5 @@ #. 50000 #. -#. +#. #. #. @@ -25606,5 +25591,5 @@ #. 50000 #. -#. +#. #. #. @@ -25614,5 +25599,5 @@ #. 50000 #. -#. +#. #. #. @@ -25622,5 +25607,5 @@ #. 50000 #. -#. +#. #. #. @@ -25630,5 +25615,5 @@ #. 50000 #. -#. +#. #. #. @@ -25638,5 +25623,5 @@ #. 50000 #. -#. +#. #. #. @@ -25646,5 +25631,5 @@ #. 50000 #. -#. +#. #. #. @@ -25654,5 +25639,5 @@ #. 50000 #. -#. +#. #. #. @@ -25662,5 +25647,5 @@ #. 50000 #. -#. +#. #. #. @@ -25670,5 +25655,5 @@ #. 50000 #. -#. +#. #. #. @@ -25678,5 +25663,5 @@ #. 50000 #. -#. +#. #. #. @@ -25686,5 +25671,5 @@ #. 50000 #. -#. +#. #. #. @@ -25694,5 +25679,5 @@ #. 50000 #. -#. +#. #. #. @@ -25702,5 +25687,5 @@ #. 50000 #. -#. +#. #. #. @@ -25710,5 +25695,5 @@ #. 50000 #. -#. +#. #. #. @@ -25718,5 +25703,5 @@ #. 50000 #. -#. +#. #. #. @@ -25726,5 +25711,5 @@ #. 50000 #. -#. +#. #. #. @@ -25733,5 +25718,5 @@ #. 50000 #. -#. +#. #. #. @@ -25763,5 +25748,5 @@ #. 50000 #. -#. +#. #. #. @@ -25771,5 +25756,5 @@ #. 50000 #. -#. +#. #. #. @@ -25779,7 +25764,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25794,5 +25779,5 @@ #. 50000 #. -#. +#. #. #. @@ -25802,5 +25787,5 @@ #. 50000 #. -#. +#. #. #. @@ -25810,5 +25795,5 @@ #. 50000 #. -#. +#. #. #. @@ -25818,5 +25803,5 @@ #. 50000 #. -#. +#. #. #. @@ -25826,5 +25811,5 @@ #. 50000 #. -#. +#. #. #. @@ -25834,5 +25819,5 @@ #. 50000 #. -#. +#. #. #. @@ -25842,5 +25827,5 @@ #. 50000 #. -#. +#. #. #. @@ -25856,7 +25841,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25866,5 +25851,5 @@ #. 50000 #. -#. +#. #. #. @@ -25874,5 +25859,5 @@ #. 50000 #. -#. +#. #. #. @@ -25882,5 +25867,5 @@ #. 50000 #. -#. +#. #. #. @@ -25890,5 +25875,5 @@ #. 50000 #. -#. +#. #. #. @@ -25898,5 +25883,5 @@ #. 50000 #. -#. +#. #. #. @@ -25906,5 +25891,5 @@ #. 50000 #. -#. +#. #. #. @@ -25914,5 +25899,5 @@ #. 50000 #. -#. +#. #. #. @@ -25922,5 +25907,5 @@ #. 50000 #. -#. +#. #. #. @@ -25930,5 +25915,5 @@ #. 50000 #. -#. +#. #. #. @@ -25938,5 +25923,5 @@ #. 50000 #. -#. +#. #. #. @@ -25946,5 +25931,5 @@ #. 50000 #. -#. +#. #. #. @@ -25954,5 +25939,5 @@ #. 50000 #. -#. +#. #. #. @@ -25962,5 +25947,5 @@ #. 50000 #. -#. +#. #. #. @@ -25970,5 +25955,5 @@ #. 50000 #. -#. +#. #. #. @@ -25978,5 +25963,5 @@ #. 50000 #. -#. +#. #. #. @@ -25986,5 +25971,5 @@ #. 50000 #. -#. +#. #. #. @@ -25994,5 +25979,5 @@ #. 50000 #. -#. +#. #. #. @@ -26002,5 +25987,5 @@ #. 50000 #. -#. +#. #. #. @@ -26010,5 +25995,5 @@ #. 50000 #. -#. +#. #. #. @@ -26018,5 +26003,5 @@ #. 50000 #. -#. +#. #. #. @@ -26026,5 +26011,5 @@ #. 50000 #. -#. +#. #. #. @@ -26034,5 +26019,5 @@ #. 50000 #. -#. +#. #. #. @@ -26042,5 +26027,5 @@ #. 50000 #. -#. +#. #. #. @@ -26050,5 +26035,5 @@ #. 50000 #. -#. +#. #. #. @@ -26058,5 +26043,5 @@ #. 50000 #. -#. +#. #. #. @@ -26066,5 +26051,5 @@ #. 50000 #. -#. +#. #. #. @@ -26074,5 +26059,5 @@ #. 50000 #. -#. +#. #. #. @@ -26082,5 +26067,5 @@ #. 50000 #. -#. +#. #. #. @@ -26090,5 +26075,5 @@ #. 50000 #. -#. +#. #. #. @@ -26098,5 +26083,5 @@ #. 50000 #. -#. +#. #. #. @@ -26106,5 +26091,5 @@ #. 50000 #. -#. +#. #. #. @@ -26114,5 +26099,5 @@ #. 50000 #. -#. +#. #. #. @@ -26122,5 +26107,5 @@ #. 50000 #. -#. +#. #. #. @@ -26130,5 +26115,5 @@ #. 50000 #. -#. +#. #. #. @@ -26138,5 +26123,5 @@ #. 50000 #. -#. +#. #. #. @@ -26146,5 +26131,5 @@ #. 50000 #. -#. +#. #. #. @@ -26154,5 +26139,5 @@ #. 50000 #. -#. +#. #. #. @@ -26162,5 +26147,5 @@ #. 50000 #. -#. +#. #. #. @@ -26170,5 +26155,5 @@ #. 50000 #. -#. +#. #. #. @@ -26178,5 +26163,5 @@ #. 50000 #. -#. +#. #. #. @@ -26186,5 +26171,5 @@ #. 50000 #. -#. +#. #. #. @@ -26194,5 +26179,5 @@ #. 50000 #. -#. +#. #. #. @@ -26228,7 +26213,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26238,5 +26223,5 @@ #. 50000 #. -#. +#. #. #. @@ -26246,5 +26231,5 @@ #. 50000 #. -#. +#. #. #. @@ -26254,5 +26239,5 @@ #. 50000 #. -#. +#. #. #. @@ -26262,5 +26247,5 @@ #. 50000 #. -#. +#. #. #. @@ -26270,5 +26255,5 @@ #. 50000 #. -#. +#. #. #. @@ -26278,5 +26263,5 @@ #. 50000 #. -#. +#. #. #. @@ -26286,5 +26271,5 @@ #. 50000 #. -#. +#. #. #. @@ -26301,5 +26286,5 @@ #. 50000 #. -#. +#. #. #. @@ -26309,5 +26294,5 @@ #. 50000 #. -#. +#. #. #. @@ -26317,5 +26302,5 @@ #. 50000 #. -#. +#. #. #. @@ -26325,5 +26310,5 @@ #. 50000 #. -#. +#. #. #. @@ -26333,5 +26318,5 @@ #. 50000 #. -#. +#. #. #. @@ -26341,5 +26326,5 @@ #. 50000 #. -#. +#. #. #. @@ -26350,5 +26335,5 @@ #. 50000 #. -#. +#. #. #. @@ -26358,5 +26343,5 @@ #. 50000 #. -#. +#. #. #. @@ -26366,5 +26351,5 @@ #. 40000 #. -#. +#. #. #. @@ -26374,5 +26359,5 @@ #. 50000 #. -#. +#. #. #. @@ -26381,5 +26366,5 @@ #. 40000 #. -#. +#. #. #. @@ -26388,5 +26373,5 @@ #. 40000 #. -#. +#. #. #. @@ -26404,7 +26389,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26414,5 +26399,5 @@ #. 50000 #. -#. +#. #. #. @@ -26422,5 +26407,5 @@ #. 50000 #. -#. +#. #. #. @@ -26430,5 +26415,5 @@ #. 50000 #. -#. +#. #. #. @@ -26438,5 +26423,5 @@ #. 50000 #. -#. +#. #. #. @@ -26446,5 +26431,5 @@ #. 50000 #. -#. +#. #. #. @@ -26454,5 +26439,5 @@ #. 50000 #. -#. +#. #. #. @@ -26462,5 +26447,5 @@ #. 50000 #. -#. +#. #. #. @@ -26470,5 +26455,5 @@ #. 50000 #. -#. +#. #. #. @@ -26478,5 +26463,5 @@ #. 50000 #. -#. +#. #. #. @@ -26495,5 +26480,5 @@ #. 50000 #. -#. +#. #. #. @@ -26507,5 +26492,5 @@ #. 50000 #. -#. +#. #. #. @@ -26519,5 +26504,5 @@ #. 50000 #. -#. +#. #. #. @@ -26527,5 +26512,5 @@ #. 50000 #. -#. +#. #. #. @@ -26539,5 +26524,5 @@ #. 50000 #. -#. +#. #. #. @@ -26551,5 +26536,5 @@ #. 50000 #. -#. +#. #. #. @@ -26563,6 +26548,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26572,5 +26557,5 @@ #. 50000 #. -#. +#. #. #. @@ -26584,5 +26569,5 @@ #. 50000 #. -#. +#. #. #. @@ -26596,5 +26581,5 @@ #. 50000 #. -#. +#. #. #. @@ -26608,5 +26593,5 @@ #. 50000 #. -#. +#. #. #. @@ -26620,5 +26605,5 @@ #. 50000 #. -#. +#. #. #. @@ -26632,5 +26617,5 @@ #. 50000 #. -#. +#. #. #. @@ -26640,7 +26625,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26650,5 +26635,5 @@ #. 50000 #. -#. +#. #. #. @@ -26658,5 +26643,5 @@ #. 50000 #. -#. +#. #. #. @@ -26666,5 +26651,5 @@ #. 50000 #. -#. +#. #. #. @@ -26674,5 +26659,5 @@ #. 50000 #. -#. +#. #. #. @@ -26689,5 +26674,5 @@ #. 50000 #. -#. +#. #. #. @@ -26700,5 +26685,5 @@ #. 50000 #. -#. +#. #. #. @@ -26712,5 +26697,5 @@ #. 50000 #. -#. +#. #. #. @@ -26724,5 +26709,5 @@ #. 50000 #. -#. +#. #. #. @@ -26736,5 +26721,5 @@ #. 50000 #. -#. +#. #. #. @@ -26745,5 +26730,5 @@ #. 50000 #. -#. +#. #. #. @@ -26753,5 +26738,5 @@ #. 50000 #. -#. +#. #. #. @@ -26761,5 +26746,5 @@ #. 50000 #. -#. +#. #. #. @@ -26769,5 +26754,5 @@ #. 50000 #. -#. +#. #. #. @@ -26777,5 +26762,5 @@ #. 50000 #. -#. +#. #. #. @@ -26792,5 +26777,5 @@ #. 50000 #. -#. +#. #. #. @@ -26804,5 +26789,5 @@ #. 50000 #. -#. +#. #. #. @@ -26816,5 +26801,5 @@ #. 50000 #. -#. +#. #. #. @@ -26828,5 +26813,5 @@ #. 50000 #. -#. +#. #. #. @@ -26840,5 +26825,5 @@ #. 50000 #. -#. +#. #. #. @@ -26852,5 +26837,5 @@ #. 50000 #. -#. +#. #. #. @@ -26859,7 +26844,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26869,5 +26854,5 @@ #. 50000 #. -#. +#. #. #. @@ -26877,5 +26862,5 @@ #. 50000 #. -#. +#. #. #. @@ -26885,5 +26870,5 @@ #. 50000 #. -#. +#. #. #. @@ -26893,5 +26878,5 @@ #. 50000 #. -#. +#. #. #. @@ -26901,5 +26886,5 @@ #. 50000 #. -#. +#. #. #. @@ -26909,5 +26894,5 @@ #. 50000 #. -#. +#. #. #. @@ -26917,5 +26902,5 @@ #. 50000 #. -#. +#. #. #. @@ -26932,7 +26917,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26942,5 +26927,5 @@ #. 50000 #. -#. +#. #. #. @@ -26950,5 +26935,5 @@ #. 50000 #. -#. +#. #. #. @@ -26958,5 +26943,5 @@ #. 50000 #. -#. +#. #. #. @@ -26966,5 +26951,5 @@ #. 50000 #. -#. +#. #. #. @@ -26980,5 +26965,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -27027,5 +27012,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27035,5 +27020,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27043,5 +27028,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27051,5 +27036,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27059,5 +27044,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27067,5 +27052,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27075,5 +27060,5 @@ #. 50000 #. -#. +#. #. #. @@ -27083,5 +27068,5 @@ #. 50000 #. -#. +#. #. #. @@ -27091,5 +27076,5 @@ #. 50000 #. -#. +#. #. #. @@ -27099,5 +27084,5 @@ #. 50000 #. -#. +#. #. #. @@ -27107,5 +27092,5 @@ #. 50000 #. -#. +#. #. #. @@ -27115,5 +27100,5 @@ #. 50000 #. -#. +#. #. #. @@ -27133,5 +27118,5 @@ #. 50000 #. -#. +#. #. #. @@ -27140,5 +27125,5 @@ #. 50000 #. -#. +#. #. #. @@ -27147,5 +27132,5 @@ #. 50000 #. -#. +#. #. #. @@ -27154,5 +27139,5 @@ #. 40000 #. -#. +#. #. #. @@ -27161,5 +27146,5 @@ #. 40000 #. -#. +#. #. #. @@ -27168,5 +27153,5 @@ #. 40000 #. -#. +#. #. #. @@ -27261,5 +27246,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -27267,28 +27252,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 @@ -27403,5 +27388,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27414,5 +27399,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27437,6 +27422,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27445,6 +27430,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27459,6 +27444,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 @@ -27472,6 +27457,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 @@ -27491,6 +27476,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27514,6 +27499,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 @@ -27526,4 +27511,87 @@ msgstr "" +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Nelze zrušit příkaz ''{0}'' protože vrstva ''{1}'' již není dostupná" + +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Povoleno nahrává všechny změny najednou, zakázáno nahrává změnu každého " +#~ "prvku samostatně" + +#~ msgid "Images for {0}" +#~ msgstr "Obrázky pro {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Číst GPX..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Žádný čas pro bod {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Nelze přečíst čas \"{0}\" z bodu {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou." + +#~ msgid "GPS start: {0}" +#~ msgstr "Start GPS: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "Konec GPS: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "nynější odchylka: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "rozdíl časových pásem: " + +#~ msgid "Sync clock" +#~ msgstr "Synchronizovat hodiny" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Data v souboru \"{0}\" nemohla být parsována." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "V souboru \"{0}\" není časová značka EXIF" + +#~ msgid "Image" +#~ msgstr "Obrázek" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synchronizace času s GPS přijímačem" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Zadaný čas nemůže být rozparsován" + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "Požadováno nahrání pluginu {0}. Tento plugin není již nadále třeba." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - obrázky s geoznačkami" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Otevřít obrázky s AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "nastavení osmarenderu" + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Několik nástrojů pro jednodužší život: např. zjednodušení cest, spojení " +#~ "ploch, skok na pozici." + #~ msgid "File could not be found." #~ msgstr "Soubor nebyl nalezen" @@ -27556,8 +27624,4 @@ #~ msgstr "Změnit" -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Smazat {1} {0}" - #~ msgid "Rotate" #~ msgstr "Otočit" @@ -27602,11 +27666,7 @@ #~ msgstr "Neuložené změny" -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Prosím zadejte nejdříve pozadovanou pozici" - #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Chyba při načítání stránky {0}" @@ -27640,6 +27700,6 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?" @@ -27693,12 +27753,13 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" -#~ "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako chybu." +#~ "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako " +#~ "chybu." #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" #~ "Vrátit stav všech vybraných objektů na verzi vybranou ze seznamu historie." @@ -27707,5 +27768,4 @@ #~ msgstr "YAHOO (GNOME oprava)" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27718,22 +27778,16 @@ #~ "some time." #~ msgstr "" -#~ "Server vrátil vnitřní chybu. Zkuste to za chvíli znovu nebo zkuste zmenšit " -#~ "oblast." +#~ "Server vrátil vnitřní chybu. Zkuste to za chvíli znovu nebo zkuste " +#~ "zmenšit oblast." #~ msgid "Transfer aborted due to error (will wait for 5 seconds):" #~ msgstr "Přenos přerušen kvůli chybě (čekám 5 sekund):" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Následující plugin vyžaduje aktulizaci JOSM: {0}." -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Chyba při mazání souboru pluginu: {0}" - #~ msgid "Plugin already exists" #~ msgstr "Plugin již existuje" -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Nemohu stáhnout plugin: {0} z {1}" @@ -27745,5 +27799,4 @@ #~ msgstr "Upravit vlastnosti" -#, java-format #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." @@ -27771,19 +27824,19 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" -#~ "Zkuste aktualizovat na nejnovější verzi tohoto pluginu před hlášením chyby." +#~ "Zkuste aktualizovat na nejnovější verzi tohoto pluginu před hlášením " +#~ "chyby." #~ msgid "Found element in non-relation." #~ msgstr "Nalezen tag mimo relaci." -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" #~ "Plugin {0} se zdá být poškozen nebo jej není možné automaticky stáhnout." -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27806,8 +27859,7 @@ #~ "about the problem." #~ msgstr "" -#~ "Plugin nebylo možné odstranit. Prosíme informujte o tomto problému vývojáře " -#~ "JOSM." - -#, java-format +#~ "Plugin nebylo možné odstranit. Prosíme informujte o tomto problému " +#~ "vývojáře JOSM." + #~ msgid "Please report a ticket at {0}" #~ msgstr "Prosíme oznamte chybu na {0}" @@ -27822,5 +27874,4 @@ #~ msgstr "Povoleny pouze dva uzly" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Nelze otevřít adresář s nastavením: {0}" @@ -27850,9 +27901,7 @@ #~ msgstr "Poslat komentář" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\"" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Použít přednastavení \"{0}\"" @@ -27867,13 +27916,10 @@ #~ msgstr "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly." -#, java-format #~ msgid "Layers: {0}" #~ msgstr "Vrstvy: {0}" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Konflikty: {0}" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Autoři: {0}" @@ -27919,6 +27965,6 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" #~ "Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?" @@ -27936,8 +27982,9 @@ #~ msgstr "Nastavit Lambertovu zónu ručně (např. pro místo mezi dvěmi zónami)" -#, java-format -#~ msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" #~ msgstr "" -#~ "Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou {1}" +#~ "Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou " +#~ "{1}" #~ msgid "Continue anyway" @@ -27946,6 +27993,6 @@ #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." #~ msgstr "" -#~ "TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před nahráním " -#~ "na server." +#~ "TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před " +#~ "nahráním na server." #~ msgid "Open a layer first (GPX, OSM, cache)" @@ -27976,5 +28023,4 @@ #~ msgstr "Sportovní potřeby" -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Přeskakuji cestu, protože obsahuje neexistující uzel: {0}\n" @@ -28007,5 +28053,4 @@ #~ msgstr "Přesto sloučit" -#, java-format #~ msgid "requested: {0}" #~ msgstr "požadováno: {0}" @@ -28041,5 +28086,4 @@ #~ msgstr "Posunout nahoru" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Editor relací: {0}" @@ -28047,10 +28091,11 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" #~ "VAROVÁNÍ: Heslo je uloženo v textovém formátu v souboru s " #~ "nastavením.
Heslo je na server posíláno nezašifrované, zakódované v " -#~ "URL.
Nepoužívejte stejné heslo, které používáte někde jinde." +#~ "URL.
Nepoužívejte stejné heslo, které používáte někde jinde." #~ msgid "Combine Anyway" @@ -28064,5 +28109,4 @@ #~ "server mají historii." -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -28074,5 +28118,4 @@ #~ msgstr "Aktualizovat data" -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "Nejprve změňte projekci na {0}." @@ -28106,5 +28149,6 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" #~ "Nenalezena aktuální data. Opravdu máte otevřenou nebo staženou datovou " @@ -28121,6 +28165,6 @@ #~ "move mouse. Select: Click." #~ msgstr "" -#~ "Zoom: pomocí kolečka myši nebo dvojkliku. Posun mapy: stiskni pravé tlačítko " -#~ "a pohybuj myší. Vybrat: Kliknutí." +#~ "Zoom: pomocí kolečka myši nebo dvojkliku. Posun mapy: stiskni pravé " +#~ "tlačítko a pohybuj myší. Vybrat: Kliknutí." #~ msgid "Add either site-josm.xml or Wiki Pages." @@ -28134,6 +28178,6 @@ #~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to selected " -#~ "user, opens browser showing selected author profile page." +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." #~ msgstr "" #~ "Nástroje pro správu autorů/uživatelů. Vybere mapová data, která patří " @@ -28145,6 +28189,6 @@ #~ msgid "" #~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to OSM " -#~ "eg. deleting uninteresting parts of track." +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." #~ msgstr "" #~ "Hlavní předností tohoto pluginu je možnost smazat body z GPX trasy. Tento " @@ -28158,5 +28202,4 @@ #~ "'pluginmanager.warntime'.)" -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -28171,6 +28214,6 @@ #~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You can " -#~ "adjust the sliders to manually match the photos." +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." #~ msgstr "" #~ "Chyba nastala při pokusu o dosazení fotografií do GPX trasy. Můžete ručně " @@ -28180,5 +28223,4 @@ #~ msgstr "Stáhne zaměřený obrázek z WMS zaměřovače na stránkách Metacarta" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28210,5 +28252,4 @@ #~ "kartografické projekce.." -#, java-format #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "Obrázek s umístěný v {0} neexistuje nebo není čitelný." @@ -28238,5 +28279,4 @@ #~ msgstr "Selhala inicializace API" -#, java-format #~ msgid "" #~ "WARNING: launching browser windows for the first {0} of {1} selected " @@ -28264,5 +28304,4 @@ #~ msgstr "Odstraňuji 1 prvek" -#, java-format #~ msgid "Remove relation member {0} {1}" #~ msgstr "Odstranit člena relace {0} {1}" @@ -28280,5 +28319,4 @@ #~ msgstr "Položka historie" -#, java-format #~ msgid "Failed to load history from the server. Details:
{0}" #~ msgstr "Selhalo nahrávání historie ze serveru. Detaily:
{0}" @@ -28287,11 +28325,10 @@ #~ msgstr "Pridat do seznamu nový XML zdroj." -#, java-format #~ msgid "The XML source (URL or filename) for {0} definition files." #~ msgstr "XML zdroj (URL nebo název souboru) pro {0} definiční soubory." #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -28307,6 +28344,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example, replacing 73 with your image id:\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28315,6 +28352,6 @@ #~ "use." #~ msgstr "" -#~ "Přidávat upravovat a mazat položky WMS pluginu můžete na záložce nastavení - " -#~ "položky se následně zobrazí v menu WMS.\n" +#~ "Přidávat upravovat a mazat položky WMS pluginu můžete na záložce " +#~ "nastavení - položky se následně zobrazí v menu WMS.\n" #~ "\n" #~ "Totéž můžete také udělat v pokročilých volbách za použití následujícího " @@ -28330,17 +28367,15 @@ #~ "Pro Metacarta§s Map Rectifier http://labs.metacarta.com/rectifier/ , " #~ "potřebujete zadat pouze odpovídající 'id'.\n" -#~ "Pro přidání položky Metacarta Map Rectifier do menu vyvořte ručně URL jako v " -#~ "příkladu a 73 nahraďte id vašeho obrázku:\n" +#~ "Pro přidání položky Metacarta Map Rectifier do menu vyvořte ručně URL " +#~ "jako v příkladu a 73 nahraďte id vašeho obrázku:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" #~ "\n" -#~ "Poznámka: Ujistěte se, že obrázek vyhovuje copyrightu (je volně šiřitelný), " -#~ "pokud si nejste jisti, nepoužívejte jej." - -#, java-format +#~ "Poznámka: Ujistěte se, že obrázek vyhovuje copyrightu (je volně " +#~ "šiřitelný), pokud si nejste jisti, nepoužívejte jej." + #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" #~ msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\"" -#, java-format #~ msgid "" #~ "Uploading failed because a primitive you tried " @@ -28348,15 +28383,14 @@ #~ "is:
{0}" #~ msgstr "" -#~ "Aktualizace selhala, protože prvek který mažete
je " -#~ "již na serveru vymazán.

Chybová zpráva je:
{0}" +#~ "Aktualizace selhala, protože prvek který " +#~ "mažete
je již na serveru vymazán.

Chybová zpráva je:
{0}" #~ msgid "Version number missing from OSM data" #~ msgstr "V OSM datech chybí číslo verze" -#, java-format #~ msgid "An error occurred while saving. Error is: {0}" #~ msgstr "Došlo k chybě při ukládání. Chyba: {0}" -#, java-format #~ msgid "Unknown file extension for file ''{0}''" #~ msgstr "Neznámá přípona souboru ''{0}''" @@ -28365,5 +28399,4 @@ #~ msgstr "Nelze hledat jelikož nejsou nahrána žádná data." -#, java-format #~ msgid "" #~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" @@ -28371,5 +28404,4 @@ #~ "Ve vrstvě ''{0}'' jsou neuložené změny. Chcete vrstvu skutečně smazat?" -#, java-format #~ msgid "Do you really want to delete layer ''{0}''?" #~ msgstr "Opravdu chcete smazat vrstvu ''{0}''?" @@ -28378,5 +28410,4 @@ #~ msgstr "Smazat vše" -#, java-format #~ msgid "Deleting layer {0} of {1}" #~ msgstr "Mazání vrstvy {0} z {1}" @@ -28388,13 +28419,10 @@ #~ msgstr "Nahradí výběr uživatelskými daty" -#, java-format #~ msgid "Use the existing changeset {0} and close it after upload" #~ msgstr "Použít existující sadu změn {0} a zavřít ji po nahrání" -#, java-format #~ msgid "Use the existing changeset {0} and leave it open" #~ msgstr "Použít existující sadu změn {0} a ponechat ji otevřenou" -#, java-format #~ msgid "" #~ "Select to upload to the existing changeset {0} and to leave the changeset " @@ -28404,5 +28432,4 @@ #~ "vkládání dalších dat" -#, java-format #~ msgid "" #~ "There are unsaved changes in {0} layer. Discard the changes and continue?" @@ -28410,6 +28437,8 @@ #~ "There are unsaved changes in {0} layers. Discard the changes and continue?" #~ msgstr[0] "V {0} vrstvě jsou neuložené změny. Zahodit změny a pokračovat?" -#~ msgstr[1] "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?" -#~ msgstr[2] "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?" +#~ msgstr[1] "" +#~ "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?" +#~ msgstr[2] "" +#~ "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?" #~ msgid "Close current changeset" @@ -28425,9 +28454,7 @@ #~ msgstr "Nahradit" -#, java-format #~ msgid "Missing mandatory attribute ''{0}''" #~ msgstr "Chybějící povinný atribut ''{0}''" -#, java-format #~ msgid "" #~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " @@ -28436,8 +28463,7 @@ #~ "Výběr \"{0}\" je použit v relaci \"{1}\".
Smazat z relace?" -#, java-format #~ msgid "" -#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " -#~ "from relation?" +#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." +#~ "
Delete from relation?" #~ msgstr "" #~ "Výběr \"{0}\" je použit v relaci \"{1}\" s rolí {2}.
Smazat z " @@ -28456,15 +28482,13 @@ #~ msgstr "Dosažena křižovatka" -#, java-format #~ msgid "Help page missing. Create it in English." #~ msgstr "Chybí stránka nápovědy. Vytvořte ji v češtině." -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" -#~ "Chybí stránka nápovědy. Vytvořte ji v angličtině anebo " -#~ "ve vašem jazyce." +#~ "Chybí stránka nápovědy. Vytvořte ji v angličtině " +#~ "anebo ve vašem jazyce." #~ msgid "Didn't find an primitive with id {0} in this dataset" @@ -28476,11 +28500,10 @@ #~ msgid "" -#~ "Helppage missing. Create it in English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" -#~ "Stránka s nápovědou chybí. Udělej jí v angličtině nebo " -#~ "ve tvém jazyce." - -#, java-format +#~ "Stránka s nápovědou chybí. Udělej jí v angličtině " +#~ "nebo ve tvém jazyce." + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "Neočekávaná návratová hodnota. Navráceno {0}" @@ -28501,5 +28524,4 @@ #~ msgstr "Zobrazit historii vybraného prvku" -#, java-format #~ msgid "" #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." @@ -28507,9 +28529,10 @@ #~ "nedovolená hodnota povinného atributu ''{0}'' typu int, zadáno ''{1}''" -#, java-format #~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''." +#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " +#~ "''{1}''." #~ msgstr "" -#~ "nedovolená hodnota povinného atributu ''{0}'' typu int (>=0), zadáno ''{1}''" +#~ "nedovolená hodnota povinného atributu ''{0}'' typu int (>=0), zadáno " +#~ "''{1}''" #~ msgid "Set manually the Lambert zone" Index: /applications/editors/josm/i18n/po/da.po =================================================================== --- /applications/editors/josm/i18n/po/da.po (revision 18974) +++ /applications/editors/josm/i18n/po/da.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:11+0000\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-11-29 22:13+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Danish \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:05+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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" @@ -116,5 +115,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 @@ -137,9 +136,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 @@ -155,20 +154,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 @@ -187,7 +182,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 "Fejl" @@ -267,5 +262,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 "Udvidelser" @@ -306,4 +301,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 @@ -311,8 +308,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 @@ -322,29 +319,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 @@ -373,9 +368,9 @@ #, java-format msgid "" -"There are no layers the source layer
''{0}''
could be merged " -"to." -msgstr "" -"Der er ingen lag, kildelaget
\"{0}\"
kunne flettes sammen " -"med." +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" +"Der er ingen lag, kildelaget
\"{0}\"
kunne flettes sammen med." #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 @@ -426,14 +421,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 "Breddegrad" #: ../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 "Længdegrad" @@ -459,10 +454,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 @@ -493,19 +488,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 @@ -514,9 +512,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 @@ -532,7 +527,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 @@ -544,11 +539,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" @@ -636,5 +631,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}" @@ -689,10 +684,10 @@ "af punkter)" -#: ../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 "Sammensæt {0} veje" -#: ../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 "Vælg mindst to veje at sammensætte." @@ -711,19 +706,19 @@ msgstr "Vælg venligst noget at kopiere." +#: ../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 "Opret cirkel" -#: ../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 "Opret cirkel ud fra tre valgte punkter." -#: ../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 "Punkterne er ikke i en cirkel. Afbryder." -#: ../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 " @@ -736,9 +731,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 @@ -810,21 +805,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" @@ -832,6 +831,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 @@ -860,5 +859,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 "Duplikér" @@ -915,8 +914,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 @@ -924,5 +921,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 @@ -935,8 +932,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 @@ -955,8 +952,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 @@ -979,13 +976,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 @@ -1025,4 +1023,100 @@ msgstr "Vis objekt-informationer om punkter, veje eller relationer i OSM." +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "Foren overlappende områder" + +#: ../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 "Kun op til to områder kan sammensættes i øjeblikket" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#, java-format +msgid "\"{0}\" is not closed and therefore can't be joined." +msgstr "\"{0}\" er ikke lukket og kan derfor ikke blive forbundet." + +#: ../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 "Fortryd venligst, hvis du ikke er sikker" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 +msgid "Please select at least one closed way the should be joined." +msgstr "Vælg mindst en lukket vej, som skal forbindes." + +#: ../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 "Tilføjede punkter ved alle kryds" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgid "Delete Ways that are not part of an inner multipolygon" +msgstr "Slet veje, som ikke er en del af en indre multipolygon" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +msgid "Fix relations" +msgstr "Ret relationer" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgid "Joined self-overlapping area" +msgstr "Sammenlagde selv-overlappende område" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +msgid "Joined overlapping areas" +msgstr "Sammensatte overlappende områder" + +#: ../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 "Indtast værdier for alle konflikter." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Løs konflikter" + +#: ../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 "Fjernede element fra relationer" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +msgid "Join Areas: Remove Short Ways" +msgstr "Sammenlæg områder: Fjern korte veje" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +msgid "Closed Way" +msgstr "Lukket vej" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgid "Remove tags from inner ways" +msgstr "Fjern tags fra indre veje" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +msgid "Join Areas Function" +msgstr "Funktion til sammenlægning af områder" + #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 @@ -1042,4 +1136,45 @@ msgstr "Ingen genvej" +#: ../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 "Indtast længde/bredde for at springe til position." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 +msgid "You can also paste an URL from www.openstreetmap.org" +msgstr "Du kan også indsætte en URL fra www.openstreetmap.org" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 +msgid "Zoom (in metres)" +msgstr "Zoom (i meter)" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 +msgid "URL" +msgstr "URL" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 +msgid "Jump there" +msgstr "Spring hertil" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 +msgid "Jump to Position" +msgstr "Hop til position" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Could not parse Latitude, Longitude or Zoom. Please check." +msgstr "Kunne ikke aflæse længde, bredde eller zoom. Tjek venligst." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Unable to parse Lon/Lat" +msgstr "Kunne ikke aflæse længde/bredde" + #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" @@ -1050,26 +1185,26 @@ msgstr "Flet det nuværende lag sammen med et andet lag" +#: ../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 "Foren punkter" -#: ../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 "Foren punkter til den ældste." -#: ../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 "Vælg mindst to punkter, der skal forenes." -#: ../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 "" @@ -1077,5 +1212,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" @@ -1450,8 +1585,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 -msgid "" -"Show status report with useful information that can be attached to bugs" -msgstr "" -"Vis statusrapport med brugbare informationer, der kan tilknyttes fejl." +msgid "Show status report with useful information that can be attached to bugs" +msgstr "Vis statusrapport med brugbare informationer, der kan tilknyttes fejl." #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 @@ -1470,9 +1603,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 "Luk" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Forenkl vej" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Slet unødige punkter fra en vej." + +#: ../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 "Er du sikker?" + +#: ../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] "Forenkl vej (fjern {0} punkt)" +msgstr[1] "Forenkl vej (fjern {0} punkter)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1599,6 +1764,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 "* Et punkt, som bruges af mere end én vej en af disse veje, eller" @@ -1678,54 +1842,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 "Opdater det valgte" +#: ../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 "Intet er valgt" -#: ../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 "" @@ -1734,35 +1898,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 "Ingen ændringer at sende." -#: ../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 "Intet at sende. Skab først noget data." -#: ../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 "Synkronisér hele datasættet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1770,28 +1934,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 "" @@ -1801,22 +1963,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 "" @@ -1827,15 +1989,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 "Opdaterer primitiv" @@ -1847,6 +2009,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 "" @@ -1855,38 +2017,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 "" @@ -2050,6 +2211,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 "" @@ -2118,38 +2279,38 @@ msgstr "valgt" -#: ../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 "Kan ikke tilføje et punkt uden for verdenen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Tilføj punkt" -#: ../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 "Tilføj punkt inde i vej" -#: ../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 "Forbind eksisterende vej til punkt" -#: ../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 "Tilføj et nyt punkt til en eksisterende vej" -#: ../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 "Tilføj punkt ind i vej og forbind" -#: ../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 "Opret nyt punkt." -#: ../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 "Vælg punkt under markøren." -#: ../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." @@ -2158,14 +2319,14 @@ msgstr[1] "Indsæt nyt punkt i {0} veje." -#: ../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 "Start ny vej fra seneste punkt." -#: ../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 "Fortsæt vej fra seneste punkt." -#: ../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 "Afslut tegning." @@ -2200,6 +2361,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 "" @@ -2299,5 +2460,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." @@ -2380,12 +2541,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - alle objekter rettet af bruger" + +#: ../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-" @@ -2393,44 +2559,44 @@ 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 "modified - alle ændrede objekter" -#: ../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 "selected - alle valgte objekter" -#: ../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 "incomplete - alle ufuldstændige objekter" -#: ../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 "" "Brug | eller OR to for at forbinde med et logisk \"eller\"" -#: ../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 "Brug \" for at angive operatorer (fx hvis key indeholder : )" -#: ../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 "Brug ( og ) for at gruppere udtryk" -#: ../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 @@ -2440,55 +2606,55 @@ msgstr "Filter" -#: ../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 "Søg" -#: ../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 "Start søgning" -#: ../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 "Intet resultat for \"{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 "Intet tilføjet til det valgte ved søgning efter \"{0}\"" -#: ../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 "Intet fjernet fra det valgte ved søgning efter \"{0}\"" -#: ../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 "Fandt {0} resultater" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "Versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "Ikke-versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "Regulært udtryk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2502,40 +2668,40 @@ "{2}" -#: ../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 "Mangler argumenter for \"eller\"." -#: ../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 "Mangler argument fro \"ikke\"." -#: ../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 "Forventede slutparentes." -#: ../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 "" @@ -2544,9 +2710,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 "" @@ -2555,5 +2721,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." @@ -2606,6 +2772,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 "" @@ -2613,5 +2778,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 "" @@ -2748,5 +2913,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 "" @@ -2765,5 +2930,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 "" @@ -2782,19 +2948,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" @@ -2803,5 +2969,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" @@ -2810,5 +2976,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" @@ -2817,5 +2983,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" @@ -2826,16 +2992,16 @@ #. 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 "" -"Du er i gang med at slette punkter uden for området.du har " -"downloadet.
Dette kan skabe problemer, fordi andre objekter (som du ikke " -"kan se) måske bruger dem.
Vil du virkelig slette?" - -#: ../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 "" +"Du er i gang med at slette punkter uden for området.du har downloadet." +"
Dette kan skabe problemer, fordi andre objekter (som du ikke kan se) " +"måske bruger dem.
Vil du virkelig slette?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "" @@ -2853,15 +3019,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 "" @@ -2870,5 +3036,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}" @@ -2878,9 +3044,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 "" @@ -2960,5 +3121,5 @@ msgstr "Udfør?" -#: ../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 " @@ -3103,6 +3264,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 "" @@ -3185,5 +3346,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3192,5 +3353,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3198,25 +3359,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 "S" #. 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 "N" #. 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 "V" #. 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 @@ -3239,25 +3400,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}" @@ -3265,6 +3427,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 "" @@ -3327,24 +3489,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 " @@ -3352,5 +3514,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 "" @@ -3382,6 +3544,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}." @@ -3402,5 +3564,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 @@ -3412,6 +3573,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 "" @@ -3422,135 +3582,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 "En vej af typen Område er ikke lukket." -#: ../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 "multipolygon-vej \"{0}\" er ikke lukket." -#: ../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 "Slettede medlem \"{0}\" i relation" -#: ../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 "Vej \"{0}\" med mindre end to punkter." -#: ../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 "Mere end én \"fra\"-vej blev fundet." -#: ../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 "Mere end én \"til\"-vej blev fundet." -#: ../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 "Mere end én \"via\" blev fundet." -#: ../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 "Ukendt rolle \"{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 "Ukendt medlemstype for \"{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 "Ingen \"fra\"-vej blev fundet." -#: ../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 "Ingen \"til\"-vej blev fundet." -#: ../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 "Intet \"via\"-punkt eller vej blev fundet." -#: ../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 "\"Fra\"-vejen begynder eller slutter ikke ved et \"via\"-punkt." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../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 "\"Til\"-vejen begynder eller slutter ikke ved et \"via\"-punkt." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "\"Fra\"-vejen begynder eller slutter ikke ved \"via\"-vejen." -#: ../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 "\"Til\"-vejen begynder eller slutter ikke ved \"via\"-vejen." -#: ../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 "Overlap mellem vejene \"{0}\" og \"{1}\"." -#: ../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 "Indre vej \"{0}\" er på ydersiden." -#: ../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 "Ingen brugbar rolle \"{0}\" for vej \"{1}\"." -#: ../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 "Ikke-vej \"{0}\" i multipolygon." -#: ../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 "Ingen ydre vej for multipolygon \"{0}\"." -#: ../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 "utagget" -#: ../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 "tekst" -#: ../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 "Fejl: {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}" @@ -3562,5 +3722,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 @@ -3579,5 +3739,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 @@ -3597,5 +3757,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 "baggrund" @@ -3713,6 +3873,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 "" @@ -3727,5 +3886,5 @@ msgstr "Vis ikke igen" -#: ../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 @@ -3733,32 +3892,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 "ufuldstændig" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "landevej" -#: ../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 "jernbane" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "vandvej" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "brug af jord" -#: ../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" @@ -3767,5 +3926,5 @@ msgstr[1] "{0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -4013,12 +4172,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Filer" -#: ../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 @@ -4032,19 +4191,19 @@ msgstr "Rediger" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Vis" -#: ../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 "Funktioner" -#: ../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 "Forudindstillinger" -#: ../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 @@ -4055,5 +4214,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Lyd" @@ -4097,29 +4256,29 @@ msgstr "skalér" -#: ../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 "Den geografiske længdegrad ved musemarkøren." -#: ../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 "Navnet på objektet ved musemarkøren." -#: ../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 "Den geografiske breddegrad ved musemarkøren." -#: ../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 "Vinklen mellem det forrige og det nuværende vejstykke." -#: ../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 "(Kompas)retningen af det tegnede linjestykke." -#: ../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 "Længden af det nytegnede vejstykke." -#: ../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 " @@ -4127,9 +4286,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(intet objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "" @@ -4236,5 +4395,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" @@ -4243,5 +4402,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" @@ -4250,5 +4409,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" @@ -4267,5 +4426,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 @@ -4282,5 +4441,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" @@ -4352,22 +4511,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." @@ -4446,6 +4605,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 "" @@ -4514,6 +4672,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" @@ -4521,6 +4679,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" @@ -4577,6 +4735,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 "" @@ -4611,7 +4769,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 "" @@ -4757,5 +4915,5 @@ msgstr "Primitiv" -#: ../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 "" @@ -4890,5 +5048,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 "" @@ -4988,7 +5146,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" @@ -4998,6 +5156,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" @@ -5031,7 +5189,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 "" @@ -5120,5 +5276,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 @@ -5185,10 +5341,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 "" @@ -5263,18 +5418,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 "Historik" -#: ../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 "Vis historikken for alle valgte elementer." -#: ../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 @@ -5284,13 +5439,13 @@ msgstr "Genindlæs" -#: ../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 "Genindlæs alle valgte objekter og genopfrisk listen." -#: ../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 "" @@ -5483,5 +5638,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 "" @@ -5524,30 +5679,30 @@ msgstr "Zoom til det valgte" -#: ../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 "Valgt: Rel.:{0} / Veje:{1} / Punkter:{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 "Markering" -#: ../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 "Valgt: {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 "Frigør panelet" -#: ../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 "Luk panelet. Du kan genåbne det med knapperne i venstre menubar." -#: ../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 "Klik for at minimere/maksimere panelet" @@ -5607,37 +5762,37 @@ msgstr "# objekter" -#: ../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 "Konflikt i data" -#: ../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 "" @@ -5646,63 +5801,91 @@ 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] "Hent alle ufuldstændige veje og punkter der er forbundet" +msgstr[1] "Hent alle ufuldstændige veje og punkter der er forbundet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Hent lokalitet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "Henter udvidelsen {0}..." + +#: ../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 "Anvend Preset" + +#: ../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 "Åbn en editor for den valgte relation" + +#: ../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 "" @@ -5712,15 +5895,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 " @@ -5728,5 +5911,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 " @@ -5734,20 +5917,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 "" @@ -5756,66 +5939,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 "Sport" + +#: ../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 "Flyt det nuværende valgte medlem op" #. 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 "Flyt det nuværende valgte medlem ned" #. 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 " @@ -5824,53 +6011,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 "Hent alle ufuldstændige veje og punkter der er forbundet" -#: ../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 "Hent medlemmer" -#: ../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 "" @@ -5880,41 +6073,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 "" @@ -5954,19 +6140,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 "Anvend ændringer" -#: ../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}''" @@ -5978,6 +6164,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 "" @@ -6159,7 +6344,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 "" @@ -6932,5 +7116,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 @@ -7167,6 +7351,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 "" @@ -7176,6 +7360,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 "" @@ -7438,13 +7622,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}" @@ -7545,6 +7729,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 "" @@ -7629,6 +7812,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] "" @@ -7642,6 +7825,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 " @@ -7696,5 +7879,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 " @@ -7702,5 +7885,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 "" @@ -7773,40 +7956,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 "Tilføjede objekter:" -#: ../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 "Ændrede objekter:" -#: ../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 "Slettede objekter:" -#: ../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:" @@ -7815,5 +7998,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:" @@ -7822,5 +8005,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:" @@ -7829,68 +8012,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 "Send ændringer" -#: ../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 "Indtast venligst først de ønskede koordinater." + +#: ../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 "Angiv en kort kommentar for de ændringer, du uploader:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../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}" @@ -7898,16 +8080,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}." @@ -7915,6 +8097,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 "" @@ -7923,5 +8105,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 "" @@ -7951,111 +8133,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Billeder for {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "Indlæs GPX..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Intet tidspunkt for punkt {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 "Kan ikke læse tidspunkt \"{0}\" for punkt {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 "Indlæser {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Ingen billeder med læsbare tidsstempler fundet" - -#: ../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 "Geotaggede billeder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "GPS-start: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "GPS-slut: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "nuværende forskel: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "tidszone-forskel: " - -#: ../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] "billede" -msgstr[1] "billeder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} inden for sporet." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Synkronisér ur" - -#: ../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 "JPEG-billeder (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "Datoen i filen \"{0}\" kunne ikke forstås." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Billede" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "GPS-enhedens tidszone (forskel fra foto)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Synkronisér tidspunkt med GPS-enhed" - -#: ../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 "Den indtastede tid kunne ikke forstås." - -#: ../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} meter" +msgstr[1] "{0} meter" + +#: ../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 "Indtast venligst et brugernavn" + +#: ../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 @@ -8063,30 +8189,30 @@ msgstr "gps-punkt" -#: ../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 "Tilpas linjetegning" -#: ../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 "Brug globale indstillinger." -#: ../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 "Tegn linjer mellem punkter for dette lag." -#: ../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 "Tegn ikke linjer mellem punkter for dette lag." -#: ../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 "Vælg linjetegnings-indstillinger" -#: ../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 @@ -8094,5 +8220,5 @@ msgstr "Tilpas farve" -#: ../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 @@ -8101,5 +8227,5 @@ msgstr "Standard" -#: ../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 @@ -8108,58 +8234,63 @@ msgstr "Vælg en farve" -#: ../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 "Markører fra navngivne punkter" -#: ../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 "Navngivne punkter fra {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215 msgid "Import Audio" msgstr "Importér lyd" -#: ../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 "Wave-lydfiler (*.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 "Lyd-markører fra {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 "Importér billeder" -#: ../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 "JPEG-billeder (*.jpg)" + +#: ../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 "Navn: {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 @@ -8167,5 +8298,5 @@ msgstr "Beskrivelse: {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" @@ -8175,5 +8306,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 @@ -8181,22 +8312,17 @@ msgstr "Beskrivelse" -#: ../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 "URL" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443 msgid "Length: " msgstr "Længde: " -#: ../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, " @@ -8205,5 +8331,5 @@ msgstr[1] "{0} ruter, " -#: ../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" @@ -8212,24 +8338,24 @@ msgstr[1] "{0} punkter" -#: ../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 "Konvertér til datalag" -#: ../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:" +#: ../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 "" "Upload af ubehandlet GPS-data som kortdata betragtes som skadeligt " "
Hvis du vil uploade traces, så kig her:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8239,29 +8365,29 @@ msgstr "Konverteret fra: {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 "Hent fra OSM langs dette spor" -#: ../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 "Hent alt inden for:" -#: ../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} meter" -#: ../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} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8272,10 +8398,10 @@ "du
at fortsætte?" -#: ../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 "" "Ingen GPX-spor er tilgængelige i laget, som der kan associeres lyd med." -#: ../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 " @@ -8283,5 +8409,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 " @@ -8289,23 +8415,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 "Datalag {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 "uden for det hentede område" -#: ../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 "version {0}" -#: ../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." @@ -8314,5 +8440,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 "" @@ -8326,5 +8452,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 "" @@ -8337,11 +8463,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" @@ -8350,32 +8476,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} består af:" -#: ../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 "API-version: {0}" -#: ../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 "Konvertér til GPX-lag" -#: ../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 "" @@ -8383,6 +8509,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 "" @@ -8421,4 +8547,357 @@ msgstr[1] "{0} punkter" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "GPX-filer (*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "Filen {0} er hentet, dog under navnet \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#, java-format +msgid "Error while parsing {0}" +msgstr "Fejl ved indlæsning {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Kunne ikke læse \"{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 "" +"Tag et billede af din GPS-modtager, mens den viser klokken.
Vis " +"billedet her.
Notér derefter tidspunktet, du kan aflæse på billedet og " +"vælg en tidszone
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Tidspunkt for foto (fra EXIF):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "GPS-tidspunkt (aflæst fra ovenstående foto): " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [dd/mm/åååå tt:mm:ss]" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +msgid "I'm in the timezone of: " +msgstr "Jeg er i tidszonen: " + +#: ../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 "Ingen dato" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "Åbn et andet foto" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +msgid "Synchronize time from a photo of the GPS receiver" +msgstr "Synkronisér tiden fra et billede på GPS-modtageren" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"Fejl ved fortolkning af datoen.\n" +"Brug venligst det angivne format" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "Ugyldig dato" + +#: ../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 "GPX-spor: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Åben endnu en GPX-sporing" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +msgid "Timezone: " +msgstr "Tidszone: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +msgid "Offset:" +msgstr "Forskydning:" + +#: ../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 "" +"Jeg kan tage et billede af min GPS-modtager.
Hjælper det?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 +msgid "Update position for: " +msgstr "Opdater position for: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 +msgid "All images" +msgstr "Alle billeder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 +msgid "Images with no exif position" +msgstr "Billeder uden EXIF-position" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 +msgid "Not yet tagged images" +msgstr "Endnu ikke taggede billeder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +msgid "Correlate images with GPX track" +msgstr "Tilpas billeder med GPX-spor" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Correlate" +msgstr "Sammenhold" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Auto-Guess" +msgstr "Automatisk gæt" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +msgid "You should select a GPX track" +msgstr "Du bør vælge et GPX-spor" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "Intet valgt GPX-spor" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Fejl ved fortolkning af tidszone.\n" +"Forventet format: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +msgid "Invalid timezone" +msgstr "Ugyldig tidszone" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Fejl ved fortolkning af forskydning.\n" +"Forventet format: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +msgid "Invalid offset" +msgstr "Ugyldig forskydning" + +#: ../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 "GPX-spor hentet" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 +msgid "The selected photos don't contain time information." +msgstr "Det valgte billede rummer ingen tidsangivelse" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 +msgid "Photos don't contain time information" +msgstr "Billederne rummer ingen tidsangivelser" + +#: ../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 "Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "GPX-sporet har ingen tidsangivelser." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "Tidszone: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "Minutter: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "Sekunder: {0}" + +#: ../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 "(Tidsforskel på {0} dage)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "Forskydning mellem spor og billeder: {0}m {1}s" + +#: ../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 "Justér tidszone og forskydning" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +msgid "Default Values" +msgstr "Standardværdier" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +msgid "Extracting GPS locations from EXIF" +msgstr "Trækker GPS-lokaliteter ud fra EXIF" + +#: ../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 "Indlæs billeder..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "Indlæser {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 "Kan ikke hente den kanoniske sti for mappen {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "Tjekker mappen {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "Fandt en null-fil i mappen {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Fejl ved hentning af filer fra mappen {0}\n" + +#: ../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 "Geotaggede billeder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "Sammenhold med GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "billede" +msgstr[1] "billeder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "{0} blev fundet, som skal gps-tagges" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +msgid "No image" +msgstr "Intet billede" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "Henter {0}" + +#: ../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 "Fejl i fil {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Vis geotaggede billeder" + +#: ../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 "Forrige" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Fjern foto fra lag" + +#: ../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 "Næste" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "Centrer synsfelt" + +#: ../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 "" +"\n" +"Højde: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/t" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8468,6 +8947,5 @@ "You need to have paused audio at the point on the track where you want the " "marker." -msgstr "" -"Du skal pause lyden på det punkt på sporet, hvor du vil have markøren." +msgstr "Du skal pause lyden på det punkt på sporet, hvor du vil have markøren." #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344 @@ -8721,5 +9199,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 @@ -8915,6 +9393,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 "" "Tegn retningspile ved hjælp af tabelopslag i stedet for kompleks matematik." @@ -8925,6 +9402,5 @@ "Don't draw arrows if they are not at least this distance away from the last " "one." -msgstr "" -"Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige." +msgstr "Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144 @@ -8978,6 +9454,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 "Brug udjævning på kortvisningen for et mere glat udseende." @@ -9046,19 +9521,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 "Udseende" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Sprog" + +#: ../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 "Standard (automatisk valgt)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Sprog" - -#: ../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 @@ -9319,6 +9794,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 "" @@ -9384,6 +9859,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 "" "

Ydermere, genvejene aktiveres når handlingerne er tildelt til et " @@ -9401,9 +9876,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 "" @@ -9427,6 +9901,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 "" @@ -9519,5 +9993,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 "Mere information om denne feature" @@ -9604,5 +10078,5 @@ msgstr "Henter punkter {0} til {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 @@ -9610,5 +10084,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9730,14 +10204,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 @@ -9765,24 +10238,31 @@ 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] "Henter punkter {0} til {1}..." +msgstr[1] "Henter punkter {0} til {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9824,27 +10304,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 "" @@ -9852,66 +10332,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 "Lukker rettesæt..." -#: ../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 "Forbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Uploader..." -#: ../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}." @@ -9946,5 +10426,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}''." @@ -9971,5 +10451,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}." @@ -9977,5 +10457,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}" @@ -9988,5 +10468,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}''." @@ -10046,7 +10526,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 "" @@ -10074,6 +10554,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 "" @@ -10139,46 +10619,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 "" @@ -10186,19 +10665,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 "Ufuldstændig -specifikation med ref=0" -#: ../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 "Ugyldigt objekt med 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 "" @@ -10208,8 +10687,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 "" @@ -10219,25 +10698,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 "" @@ -10245,5 +10724,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10252,5 +10731,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10258,5 +10737,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10265,13 +10744,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 "Forbereder OSM-data..." -#: ../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 "" @@ -10324,4 +10803,10 @@ msgid "Contacting Server..." msgstr "Forbinder til server..." + +#: ../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 @@ -10360,42 +10845,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 "" @@ -10437,17 +10923,27 @@ msgstr "Henter udvidelsen {0}..." -#: ../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 "Slet {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Fejl ved sletning af udvidelsesfil: {0}" + +#: ../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 "Hent udvidelse" -#: ../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}." @@ -10459,19 +10955,18 @@ msgstr "En fejl opstod i udvidelsen {0}" -#: ../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" @@ -10480,50 +10975,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 "Seneste udvidelsesopdatering mere end {0} dage siden." -#: ../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 "Udvidelsen {0} kræver at JOSM skal opdateres til version {1}." -#: ../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 "Udvidelsen {0} kræves af udvidelsen {1}, men blev ikke fundet." -#: ../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 "Udvidelsen blev ikke fundet: {0}" -#: ../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 "Kunne ikke indlæse udvidelsen {0}. Fjern fra indstillinger?" -#: ../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 "Deaktivér udvidelse." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Keep plugin" msgstr "Behold udvidelse" -#: ../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 " @@ -10533,9 +11028,9 @@ "til at overskrive de eksisterende udvidelser." -#: ../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 "" @@ -10543,10 +11038,10 @@ msgstr "En uventet fejl opstod, som kan stamme fra \"{0}\"-udvidelsen." -#: ../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 "Ifølge udvidelsen medfølgende information, så er {0} forfatteren." -#: ../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." @@ -10555,9 +11050,9 @@ "fejlrapport." -#: ../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 "Skal udvidelsen deaktiveres?" -#: ../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 " @@ -10567,13 +11062,13 @@ "udvidelsen." -#: ../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" @@ -10692,6 +11187,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 "" @@ -10729,6 +11224,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 "" @@ -10790,7 +11285,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 "" @@ -10802,7 +11296,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 "" @@ -10834,6 +11328,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 "" @@ -11092,5 +11586,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" @@ -11105,12 +11599,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 "Ulige" -#: ../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 @@ -11118,456 +11610,144 @@ msgstr "Lige" -#: ../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 "Nummer" + +#. 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 "kul" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "billede" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Udlejning" + +#: ../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 "indre segment" + +#: ../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 "AgPifoJ - Geotaggede billeder" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "Vis geotaggede billeder" - -#: ../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 "Forrige" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Fjern foto fra lag" - -#: ../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 "Næste" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "Centrer synsfelt" - -#: ../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 "" -"\n" -"Højde: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/t" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "Trækker GPS-lokaliteter ud fra EXIF" - -#: ../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 "Indlæs billeder..." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:186 -#, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "Kan ikke hente den kanoniske sti for mappen {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "Tjekker mappen {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "Fandt en null-fil i mappen {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Fejl ved hentning af filer fra mappen {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "Sammenhold med GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} blev fundet, som skal gps-tagges" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "Åbn billeder med AgPifoJ..." - -#: ../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 "Hent billedsæt som et nyt lag." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "GPX-filer (*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "Filen {0} er hentet, dog under navnet \"{1}\"" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#, java-format -msgid "Error while parsing {0}" -msgstr "Fejl ved indlæsning {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Kunne ikke læse \"{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 "" -"Tag et billede af din GPS-modtager, mens den viser klokken.
Vis " -"billedet her.
Notér derefter tidspunktet, du kan aflæse på billedet og " -"vælg en tidszone
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Tidspunkt for foto (fra EXIF):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "GPS-tidspunkt (aflæst fra ovenstående foto): " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [dd/mm/åååå tt:mm:ss]" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 -msgid "I'm in the timezone of: " -msgstr "Jeg er i tidszonen: " - -#: ../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 "Ingen dato" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "Åbn et andet foto" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 -msgid "Synchronize time from a photo of the GPS receiver" -msgstr "Synkronisér tiden fra et billede på GPS-modtageren" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"Fejl ved fortolkning af datoen.\n" -"Brug venligst det angivne format" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "Ugyldig dato" - -#: ../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 "GPX-spor: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Åben endnu en GPX-sporing" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -msgid "Timezone: " -msgstr "Tidszone: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 -msgid "Offset:" -msgstr "Forskydning:" - -#: ../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 "" -"Jeg kan tage et billede af min GPS-modtager.
Hjælper det?" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Opdater position for: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Alle billeder" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Billeder uden EXIF-position" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Endnu ikke taggede billeder" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 -msgid "Correlate images with GPX track" -msgstr "Tilpas billeder med GPX-spor" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Correlate" -msgstr "Sammenhold" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Automatisk gæt" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "Du bør vælge et GPX-spor" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Intet valgt GPX-spor" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Fejl ved fortolkning af tidszone.\n" -"Forventet format: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Ugyldig tidszone" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Fejl ved fortolkning af forskydning.\n" -"Forventet format: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Ugyldig forskydning" - -#: ../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 "GPX-spor hentet" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "Det valgte billede rummer ingen tidsangivelse" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Billederne rummer ingen tidsangivelser" - -#: ../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 "" -"Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX-sporet har ingen tidsangivelser." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Tidszone: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minutter: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Sekunder: {0}" - -#: ../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 "(Tidsforskel på {0} dage)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Forskydning mellem spor og billeder: {0}m {1}s" - -#: ../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 "Justér tidszone og forskydning" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Standardværdier" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433 -msgid "No image" -msgstr "Intet billede" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "Henter {0}" - -#: ../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 "Fejl i fil {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11711,11 +11891,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 "" @@ -12025,12 +12204,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] "Forenkl vej (fjern {0} punkt)" -msgstr[1] "Forenkl vej (fjern {0} punkter)" - #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 @@ -12142,14 +12313,14 @@ msgstr "Farveskemaer" -#: ../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 " @@ -12457,4 +12628,8 @@ msgstr "Åbn billeder med ImageWayPoint" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Hent billedsæt som et nyt lag." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -12498,18 +12673,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" @@ -12558,7 +12733,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12568,5 +12743,5 @@ #. 50000 #. -#. +#. #. #. @@ -12576,5 +12751,5 @@ #. 50000 #. -#. +#. #. #. @@ -12583,5 +12758,5 @@ #. 50000 #. -#. +#. #. #. @@ -12591,5 +12766,5 @@ #. 50000 #. -#. +#. #. #. @@ -12667,6 +12842,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 "" "Maksimalt antal segmenter tillladt for hver genereret vej. Standard er 250." @@ -12686,7 +12860,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 "" @@ -12748,20 +12921,19 @@ msgstr "Kunne ikke hente billede" -#: ../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 "Forbinder" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Forbundet" -#. 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 "Ikke forbundet" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "Forbindelsen mislykkedes" @@ -12978,6 +13150,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 "" @@ -13060,9 +13231,10 @@ msgstr "Ukendt filtype: {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 "Osmarender" -#: ../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 " @@ -13072,9 +13244,5 @@ "under indstillingerne." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "osmarender-indstillinger" - -#: ../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 "Firefox-programfil" @@ -13106,6 +13274,5 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "A plugin that allows JOSM to be controlled from other applications." -msgstr "" -"En udvidelse, som tillader JOSM at blive styret fra andre programmer." +msgstr "En udvidelse, som tillader JOSM at blive styret fra andre programmer." #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 @@ -13448,17 +13615,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 "" @@ -13502,160 +13669,4 @@ msgid "Optional" msgstr "Valgfri" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "Foren overlappende områder" - -#: ../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 "Kun op til to områder kan sammensættes i øjeblikket" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 -#, java-format -msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "\"{0}\" er ikke lukket og kan derfor ikke blive forbundet." - -#: ../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 "Fortryd venligst, hvis du ikke er sikker" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 -msgid "Please select at least one closed way the should be joined." -msgstr "Vælg mindst en lukket vej, som skal forbindes." - -#: ../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 "Tilføjede punkter ved alle kryds" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221 -msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "Slet veje, som ikke er en del af en indre multipolygon" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226 -msgid "Fix relations" -msgstr "Ret relationer" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 -msgid "Joined self-overlapping area" -msgstr "Sammenlagde selv-overlappende område" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 -msgid "Joined overlapping areas" -msgstr "Sammensatte overlappende områder" - -#: ../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 "Indtast værdier for alle konflikter." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Løs konflikter" - -#: ../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 "Fjernede element fra relationer" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571 -msgid "Join Areas: Remove Short Ways" -msgstr "Sammenlæg områder: Fjern korte veje" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587 -msgid "Closed Way" -msgstr "Lukket vej" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854 -msgid "Remove tags from inner ways" -msgstr "Fjern tags fra indre veje" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883 -msgid "Join Areas Function" -msgstr "Funktion til sammenlægning af områder" - -#: ../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 "Indtast længde/bredde for at springe til position." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 -msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "Du kan også indsætte en URL fra www.openstreetmap.org" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 -msgid "Zoom (in metres)" -msgstr "Zoom (i meter)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -msgid "Jump there" -msgstr "Spring hertil" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 -msgid "Jump to Position" -msgstr "Hop til position" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Could not parse Latitude, Longitude or Zoom. Please check." -msgstr "Kunne ikke aflæse længde, bredde eller zoom. Tjek venligst." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Unable to parse Lon/Lat" -msgstr "Kunne ikke aflæse længde/bredde" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Simplify Way" -msgstr "Forenkl vej" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Slet unødige punkter fra en vej." - -#: ../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 "Er du sikker?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13754,5 +13765,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}" @@ -13805,34 +13816,34 @@ msgstr "Ignorér de valgte fejl næste gang." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Hele gruppen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Enkelte elementer" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Intet" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Ignorér hele gruppen eller enkelte elementer?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 msgid "Ignoring elements" msgstr "Ignorerer elementer" -#: ../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 "" @@ -13881,10 +13892,10 @@ msgstr "Krydsende veje" -#: ../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 "Dublet-punkter" -#: ../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 "" @@ -13892,9 +13903,9 @@ "sted." -#: ../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 "" @@ -14094,6 +14105,5 @@ #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "" -"Værdien \"{0}\" for nøglen \"{1}\" findes ikke i forudindstillingerne" +msgstr "Værdien \"{0}\" for nøglen \"{1}\" findes ikke i forudindstillingerne" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:541 @@ -14131,7 +14141,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 "" @@ -14274,5 +14283,5 @@ #. 50000 #. -#. +#. #. #. @@ -14280,5 +14289,5 @@ #. #. -#. +#. #. #. @@ -14288,5 +14297,5 @@ #. 50000 #. -#. +#. #. #. @@ -14295,5 +14304,5 @@ #. 50000 #. -#. +#. #. #. @@ -14302,5 +14311,5 @@ #. 50000 #. -#. +#. #. #. @@ -14309,5 +14318,5 @@ #. 50000 #. -#. +#. #. #. @@ -14316,5 +14325,5 @@ #. 50000 #. -#. +#. #. #. @@ -14323,9 +14332,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14370,5 +14379,5 @@ #. 50000 #. -#. +#. #. #. @@ -14414,6 +14423,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38 msgid "This test checks for untagged nodes that are not part of any way." -msgstr "" -"Denne test tjekker for utaggede punkter, som ikke er del af nogen vej." +msgstr "Denne test tjekker for utaggede punkter, som ikke er del af nogen vej." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59 @@ -14503,14 +14511,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 " @@ -14519,14 +14527,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 "" @@ -14535,5 +14543,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 "" @@ -14545,13 +14553,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." @@ -14707,50 +14715,50 @@ "opløsningen." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "Hent synlige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "Skift opløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Reload erroneous tiles" msgstr "Genhent fejlagtige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Alpha channel" msgstr "Alpha-kanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:369 msgid "Save WMS layer to file" msgstr "Gem WMS-lag til fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "Gem WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "Hent WMS-lag fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "Hent WMS-lag" -#: ../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 "Fil format fejl" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "Fejl ved indlæsning af fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -14826,5 +14834,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 "" @@ -14864,23 +14872,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 "" -"Endnu en geotag-udvidelse for JOSM. Sammeholder billeder med GPS-spor samt " -"importerer EXIF-geotaggede billeder." - -#. 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 " @@ -14892,21 +14893,21 @@ #. Plugin Create_grid_of_ways -#: build/trans_plugins.java:11 +#: build/trans_plugins.java:9 msgid "Create a grid of ways." msgstr "Opret et gitter af veje" #. Plugin czechaddress +#: build/trans_plugins.java:11 +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 " @@ -14917,10 +14918,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 " @@ -14931,21 +14932,20 @@ #. Plugin globalsat +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." +msgstr "Hent GPS-punkter direkte ind i JOSM fra Globalsat dg100-datalogger." + +#. Plugin graphview #: build/trans_plugins.java:23 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." -msgstr "Hent GPS-punkter direkte ind i JOSM fra Globalsat dg100-datalogger." - -#. 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 -#: build/trans_plugins.java:27 msgid "Provide a background layer that displays a map grid" msgstr "Tilføj et baggrundslag, der viser et kort-gitter" #. Plugin ImageWayPoint -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -14955,10 +14955,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Hjælper med at vektorisere billeder fra WMS." #. Plugin livegps -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -14968,5 +14968,5 @@ #. Plugin measurement -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -14976,10 +14976,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 " @@ -14988,5 +14988,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 " @@ -14996,29 +14996,29 @@ #. 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 -#: build/trans_plugins.java:45 msgid "Imports issues from OpenStreetBugs" msgstr "Importerer sager fra OpenStreetBugs" #. Plugin openvisible +#: build/trans_plugins.java:45 +msgid "" +"Allows opening gpx/osm files that intersect the currently visible screen area" +msgstr "" +"Tillader at åbne gpx/osm-filer, der overlapper det nuværende synlige område" + +#. Plugin osmarender #: build/trans_plugins.java:47 msgid "" -"Allows opening gpx/osm files that intersect the currently visible screen area" -msgstr "" -"Tillader at åbne gpx/osm-filer, der overlapper det nuværende synlige område" - -#. Plugin osmarender +"Launches FireFox to display the current visible screen as a nice SVG image." +msgstr "" +"Starter Firefox for at vise det synlige område som et pænt SVG-billede." + +#. Plugin PicLayer #: build/trans_plugins.java:49 -msgid "" -"Launches FireFox to display the current visible screen as a nice SVG image." -msgstr "" -"Starter Firefox for at vise det synlige område som et pænt SVG-billede." - -#. Plugin PicLayer -#: build/trans_plugins.java:51 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -15027,15 +15027,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 "Tillad andre applikationer at sende kommandoer til JOSM." #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15044,10 +15044,10 @@ #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:57 msgid "Provides routing capabilities." msgstr "Tilføjer ruteplan-egenskaber" #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:59 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -15056,16 +15056,15 @@ #. Plugin surveyor +#: build/trans_plugins.java:61 +msgid "Allow adding markers/nodes on current gps positions." +msgstr "Tillad tilføjelse af markører/punkter på de nuværende gps-positioner." + +#. Plugin tageditor #: build/trans_plugins.java:63 -msgid "Allow adding markers/nodes on current gps positions." -msgstr "" -"Tillad tilføjelse af markører/punkter på de nuværende gps-positioner." - -#. Plugin tageditor -#: build/trans_plugins.java:65 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Tilføjer en dialogboks for at rette tags i tabelform." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:65 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -15075,19 +15074,10 @@ #. Plugin terracer -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:67 msgid "Make terraced houses out of single blocks." msgstr "Laver rækkehuse ud af en enkelt blok." -#. 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 "" -"Adskillige funktioner, der gør dit arbejde lettere: Fx forenkl vej, " -"sammensæt områder, spring til position." - #. Plugin validator -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -15098,5 +15088,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15105,10 +15095,10 @@ #. Plugin waydownloader -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "Let download langs en lang serie af forbundne veje" #. Plugin wmsplugin -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -16162,8 +16152,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16360,5 +16350,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16368,5 +16358,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16385,5 +16375,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16393,5 +16383,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16410,5 +16400,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16418,5 +16408,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16435,5 +16425,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16443,5 +16433,5 @@ #. 300000 #. -#. +#. #. #. @@ -16456,5 +16446,5 @@ #. 300000 #. -#. +#. #. #. @@ -16472,5 +16462,5 @@ #. 50000 #. -#. +#. #. #. @@ -16488,5 +16478,5 @@ #. 40000 #. -#. +#. #. #. @@ -16495,5 +16485,5 @@ #. 40000 #. -#. +#. #. #. @@ -16503,5 +16493,5 @@ #. 50000 #. -#. +#. #. #. @@ -16521,5 +16511,5 @@ #. 50000 #. -#. +#. #. #. @@ -16528,5 +16518,5 @@ #. 50000 #. -#. +#. #. #. @@ -16536,5 +16526,5 @@ #. 50000 #. -#. +#. #. #. @@ -16584,7 +16574,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17283,5 +17273,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17320,5 +17310,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17414,5 +17404,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17569,5 +17559,5 @@ #. 50000 #. -#. +#. #. #. @@ -18954,5 +18944,5 @@ #. 30000 #. -#. +#. #. #. @@ -18962,5 +18952,5 @@ #. 40000 #. -#. +#. #. #. @@ -18970,5 +18960,5 @@ #. 20000 #. -#. +#. #. #. @@ -18978,5 +18968,5 @@ #. 40000 #. -#. +#. #. #. @@ -19334,7 +19324,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19344,5 +19334,5 @@ #. 50000 #. -#. +#. #. #. @@ -19352,5 +19342,5 @@ #. 50000 #. -#. +#. #. #. @@ -19360,5 +19350,5 @@ #. 50000 #. -#. +#. #. #. @@ -19368,5 +19358,5 @@ #. 50000 #. -#. +#. #. #. @@ -19376,5 +19366,5 @@ #. 50000 #. -#. +#. #. #. @@ -19384,5 +19374,5 @@ #. 50000 #. -#. +#. #. #. @@ -19392,5 +19382,5 @@ #. 50000 #. -#. +#. #. #. @@ -19400,5 +19390,5 @@ #. 50000 #. -#. +#. #. #. @@ -19408,5 +19398,5 @@ #. 50000 #. -#. +#. #. #. @@ -19416,5 +19406,5 @@ #. 50000 #. -#. +#. #. #. @@ -19424,5 +19414,5 @@ #. 50000 #. -#. +#. #. #. @@ -19432,5 +19422,5 @@ #. 50000 #. -#. +#. #. #. @@ -19440,5 +19430,5 @@ #. 50000 #. -#. +#. #. #. @@ -19448,5 +19438,5 @@ #. 50000 #. -#. +#. #. #. @@ -19456,5 +19446,5 @@ #. 50000 #. -#. +#. #. #. @@ -19464,5 +19454,5 @@ #. 50000 #. -#. +#. #. #. @@ -19472,5 +19462,5 @@ #. 50000 #. -#. +#. #. #. @@ -19480,5 +19470,5 @@ #. 50000 #. -#. +#. #. #. @@ -19488,5 +19478,5 @@ #. 50000 #. -#. +#. #. #. @@ -19496,5 +19486,5 @@ #. 50000 #. -#. +#. #. #. @@ -19504,5 +19494,5 @@ #. 50000 #. -#. +#. #. #. @@ -19512,5 +19502,5 @@ #. 50000 #. -#. +#. #. #. @@ -19520,5 +19510,5 @@ #. 50000 #. -#. +#. #. #. @@ -19528,5 +19518,5 @@ #. 50000 #. -#. +#. #. #. @@ -19536,5 +19526,5 @@ #. 50000 #. -#. +#. #. #. @@ -19544,5 +19534,5 @@ #. 50000 #. -#. +#. #. #. @@ -19552,5 +19542,5 @@ #. 50000 #. -#. +#. #. #. @@ -19560,5 +19550,5 @@ #. 50000 #. -#. +#. #. #. @@ -19568,5 +19558,5 @@ #. 50000 #. -#. +#. #. #. @@ -19576,5 +19566,5 @@ #. 50000 #. -#. +#. #. #. @@ -19584,5 +19574,5 @@ #. 50000 #. -#. +#. #. #. @@ -19592,5 +19582,5 @@ #. 50000 #. -#. +#. #. #. @@ -19600,5 +19590,5 @@ #. 50000 #. -#. +#. #. #. @@ -19608,5 +19598,5 @@ #. 50000 #. -#. +#. #. #. @@ -19616,5 +19606,5 @@ #. 50000 #. -#. +#. #. #. @@ -19624,5 +19614,5 @@ #. 50000 #. -#. +#. #. #. @@ -19632,5 +19622,5 @@ #. 50000 #. -#. +#. #. #. @@ -19640,5 +19630,5 @@ #. 50000 #. -#. +#. #. #. @@ -19648,5 +19638,5 @@ #. 50000 #. -#. +#. #. #. @@ -19656,5 +19646,5 @@ #. 50000 #. -#. +#. #. #. @@ -19664,5 +19654,5 @@ #. 50000 #. -#. +#. #. #. @@ -19672,5 +19662,5 @@ #. 50000 #. -#. +#. #. #. @@ -19680,5 +19670,5 @@ #. 50000 #. -#. +#. #. #. @@ -19688,5 +19678,5 @@ #. 50000 #. -#. +#. #. #. @@ -19696,5 +19686,5 @@ #. 50000 #. -#. +#. #. #. @@ -19704,5 +19694,5 @@ #. 50000 #. -#. +#. #. #. @@ -21396,7 +21386,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21406,5 +21396,5 @@ #. 50000 #. -#. +#. #. #. @@ -21414,5 +21404,5 @@ #. 50000 #. -#. +#. #. #. @@ -21422,5 +21412,5 @@ #. 50000 #. -#. +#. #. #. @@ -21430,5 +21420,5 @@ #. 50000 #. -#. +#. #. #. @@ -21438,5 +21428,5 @@ #. 50000 #. -#. +#. #. #. @@ -21446,5 +21436,5 @@ #. 50000 #. -#. +#. #. #. @@ -21454,5 +21444,5 @@ #. 50000 #. -#. +#. #. #. @@ -22783,5 +22773,5 @@ #. 40000 #. -#. +#. #. #. @@ -22797,5 +22787,5 @@ #. 30000 #. -#. +#. #. #. @@ -22806,7 +22796,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22816,5 +22806,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22824,13 +22822,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22840,5 +22830,5 @@ #. 50000 #. -#. +#. #. #. @@ -22871,5 +22861,5 @@ #. 50000 #. -#. +#. #. #. @@ -22885,5 +22875,5 @@ #. 50000 #. -#. +#. #. #. @@ -22893,5 +22883,5 @@ #. 10000 #. -#. +#. #. #. @@ -22901,5 +22891,5 @@ #. 10000 #. -#. +#. #. #. @@ -22910,5 +22900,5 @@ #. 10000 #. -#. +#. #. #. @@ -22937,5 +22927,5 @@ #. 50000 #. -#. +#. #. #. @@ -23050,9 +23040,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 @@ -23060,5 +23050,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, @@ -23068,8 +23058,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 @@ -23083,5 +23073,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23089,5 +23079,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23136,6 +23126,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23215,5 +23205,5 @@ #. 40000 #. -#. +#. #. #. @@ -23223,5 +23213,5 @@ #. 10000 #. -#. +#. #. #. @@ -23230,5 +23220,5 @@ #. 50000 #. -#. +#. #. #. @@ -23238,5 +23228,5 @@ #. 50000 #. -#. +#. #. #. @@ -23245,5 +23235,5 @@ #. 50000 #. -#. +#. #. #. @@ -23252,5 +23242,5 @@ #. 50000 #. -#. +#. #. #. @@ -23259,5 +23249,5 @@ #. 50000 #. -#. +#. #. #. @@ -23266,5 +23256,5 @@ #. 50000 #. -#. +#. #. #. @@ -23273,5 +23263,5 @@ #. 40000 #. -#. +#. #. #. @@ -23280,5 +23270,5 @@ #. 50000 #. -#. +#. #. #. @@ -23287,5 +23277,5 @@ #. 50000 #. -#. +#. #. #. @@ -23294,5 +23284,5 @@ #. 50000 #. -#. +#. #. #. @@ -23301,5 +23291,5 @@ #. 50000 #. -#. +#. #. #. @@ -23308,5 +23298,5 @@ #. 50000 #. -#. +#. #. #. @@ -23315,5 +23305,5 @@ #. 50000 #. -#. +#. #. #. @@ -23323,5 +23313,5 @@ #. 50000 #. -#. +#. #. #. @@ -23330,5 +23320,5 @@ #. 50000 #. -#. +#. #. #. @@ -23339,5 +23329,5 @@ #. 50000 #. -#. +#. #. #. @@ -23349,11 +23339,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23362,7 +23352,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23373,5 +23363,5 @@ #. 50000 #. -#. +#. #. #. @@ -23382,5 +23372,5 @@ #. 50000 #. -#. +#. #. #. @@ -23391,5 +23381,5 @@ #. 50000 #. -#. +#. #. #. @@ -23400,5 +23390,5 @@ #. 50000 #. -#. +#. #. #. @@ -23409,5 +23399,5 @@ #. 50000 #. -#. +#. #. #. @@ -23418,5 +23408,5 @@ #. 40000 #. -#. +#. #. #. @@ -23428,5 +23418,5 @@ #. 50000 #. -#. +#. #. #. @@ -23437,5 +23427,5 @@ #. 50000 #. -#. +#. #. #. @@ -23460,5 +23450,5 @@ #. 10000 #. -#. +#. #. #. @@ -23467,5 +23457,5 @@ #. 50000 #. -#. +#. #. #. @@ -23474,5 +23464,5 @@ #. 50000 #. -#. +#. #. #. @@ -23488,5 +23478,5 @@ #. 20000 #. -#. +#. #. #. @@ -23500,5 +23490,5 @@ #. 30000 #. -#. +#. #. #. @@ -23507,5 +23497,5 @@ #. 50000 #. -#. +#. #. #. @@ -23514,5 +23504,5 @@ #. 50000 #. -#. +#. #. #. @@ -23521,5 +23511,5 @@ #. 50000 #. -#. +#. #. #. @@ -23528,5 +23518,5 @@ #. 50000 #. -#. +#. #. #. @@ -23535,5 +23525,5 @@ #. 50000 #. -#. +#. #. #. @@ -23542,5 +23532,5 @@ #. 50000 #. -#. +#. #. #. @@ -23549,5 +23539,5 @@ #. 50000 #. -#. +#. #. #. @@ -23556,5 +23546,5 @@ #. 50000 #. -#. +#. #. #. @@ -23563,5 +23553,5 @@ #. 50000 #. -#. +#. #. #. @@ -23570,5 +23560,5 @@ #. 50000 #. -#. +#. #. #. @@ -23577,5 +23567,5 @@ #. 50000 #. -#. +#. #. #. @@ -23584,5 +23574,5 @@ #. 50000 #. -#. +#. #. #. @@ -23591,5 +23581,5 @@ #. 50000 #. -#. +#. #. #. @@ -23598,5 +23588,5 @@ #. 50000 #. -#. +#. #. #. @@ -23767,7 +23757,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23781,5 +23771,5 @@ #. 40000 #. -#. +#. #. #. @@ -23789,7 +23779,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23799,5 +23789,5 @@ #. 50000 #. -#. +#. #. #. @@ -23807,5 +23797,5 @@ #. 50000 #. -#. +#. #. #. @@ -23815,5 +23805,5 @@ #. 50000 #. -#. +#. #. #. @@ -23823,5 +23813,5 @@ #. 50000 #. -#. +#. #. #. @@ -23837,5 +23827,5 @@ #. 10000 #. -#. +#. #. #. @@ -23845,5 +23835,5 @@ #. 50000 #. -#. +#. #. #. @@ -23853,5 +23843,5 @@ #. 50000 #. -#. +#. #. #. @@ -23861,5 +23851,5 @@ #. 50000 #. -#. +#. #. #. @@ -23869,5 +23859,5 @@ #. 50000 #. -#. +#. #. #. @@ -23877,5 +23867,5 @@ #. 50000 #. -#. +#. #. #. @@ -23885,5 +23875,5 @@ #. 50000 #. -#. +#. #. #. @@ -23902,5 +23892,5 @@ #. 50000 #. -#. +#. #. #. @@ -23909,5 +23899,5 @@ #. 50000 #. -#. +#. #. #. @@ -23921,5 +23911,5 @@ #. 50000 #. -#. +#. #. #. @@ -23933,5 +23923,5 @@ #. 50000 #. -#. +#. #. #. @@ -23940,5 +23930,5 @@ #. 50000 #. -#. +#. #. #. @@ -23952,5 +23942,5 @@ #. 50000 #. -#. +#. #. #. @@ -23965,5 +23955,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23978,5 +23968,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23990,5 +23980,5 @@ #. 50000 #. -#. +#. #. #. @@ -24002,5 +23992,5 @@ #. 50000 #. -#. +#. #. #. @@ -24009,5 +23999,5 @@ #. 50000 #. -#. +#. #. #. @@ -24016,5 +24006,5 @@ #. 50000 #. -#. +#. #. #. @@ -24028,5 +24018,5 @@ #. 50000 #. -#. +#. #. #. @@ -24036,5 +24026,5 @@ #. 50000 #. -#. +#. #. #. @@ -24043,5 +24033,5 @@ #. 50000 #. -#. +#. #. #. @@ -24050,5 +24040,5 @@ #. 50000 #. -#. +#. #. #. @@ -24057,5 +24047,5 @@ #. 50000 #. -#. +#. #. #. @@ -24065,5 +24055,5 @@ #. 50000 #. -#. +#. #. #. @@ -24074,5 +24064,5 @@ #. 50000 #. -#. +#. #. #. @@ -24082,7 +24072,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24092,5 +24082,5 @@ #. 50000 #. -#. +#. #. #. @@ -24100,5 +24090,5 @@ #. 50000 #. -#. +#. #. #. @@ -24108,5 +24098,5 @@ #. 50000 #. -#. +#. #. #. @@ -24117,5 +24107,5 @@ #. 50000 #. -#. +#. #. #. @@ -24125,5 +24115,5 @@ #. 50000 #. -#. +#. #. #. @@ -24133,5 +24123,5 @@ #. 50000 #. -#. +#. #. #. @@ -24141,5 +24131,5 @@ #. 50000 #. -#. +#. #. #. @@ -24149,5 +24139,5 @@ #. 50000 #. -#. +#. #. #. @@ -24157,5 +24147,5 @@ #. 50000 #. -#. +#. #. #. @@ -24165,5 +24155,5 @@ #. 50000 #. -#. +#. #. #. @@ -24173,5 +24163,5 @@ #. 50000 #. -#. +#. #. #. @@ -24181,5 +24171,5 @@ #. 50000 #. -#. +#. #. #. @@ -24202,7 +24192,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24212,5 +24202,5 @@ #. 50000 #. -#. +#. #. #. @@ -24219,5 +24209,5 @@ #. 50000 #. -#. +#. #. #. @@ -24227,5 +24217,5 @@ #. 50000 #. -#. +#. #. #. @@ -24234,5 +24224,5 @@ #. 50000 #. -#. +#. #. #. @@ -24242,5 +24232,5 @@ #. 50000 #. -#. +#. #. #. @@ -24250,5 +24240,5 @@ #. 50000 #. -#. +#. #. #. @@ -24264,5 +24254,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24273,5 +24263,5 @@ #. 50000 #. -#. +#. #. #. @@ -24290,5 +24280,5 @@ #. 50000 #. -#. +#. #. #. @@ -24298,5 +24288,5 @@ #. 50000 #. -#. +#. #. #. @@ -24309,5 +24299,5 @@ #. 50000 #. -#. +#. #. #. @@ -24325,5 +24315,5 @@ #. 50000 #. -#. +#. #. #. @@ -24332,5 +24322,5 @@ #. 50000 #. -#. +#. #. #. @@ -24339,5 +24329,5 @@ #. 50000 #. -#. +#. #. #. @@ -24346,7 +24336,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24357,5 +24347,5 @@ #. 50000 #. -#. +#. #. #. @@ -24370,5 +24360,5 @@ #. 50000 #. -#. +#. #. #. @@ -24382,5 +24372,5 @@ #. 50000 #. -#. +#. #. #. @@ -24390,5 +24380,5 @@ #. 50000 #. -#. +#. #. #. @@ -24402,5 +24392,5 @@ #. 50000 #. -#. +#. #. #. @@ -24414,5 +24404,5 @@ #. 50000 #. -#. +#. #. #. @@ -24421,7 +24411,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24431,5 +24421,5 @@ #. 50000 #. -#. +#. #. #. @@ -24439,5 +24429,5 @@ #. 50000 #. -#. +#. #. #. @@ -24447,5 +24437,5 @@ #. 50000 #. -#. +#. #. #. @@ -24455,5 +24445,5 @@ #. 50000 #. -#. +#. #. #. @@ -24469,7 +24459,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24484,5 +24474,5 @@ #. 30000 #. -#. +#. #. #. @@ -24497,5 +24487,5 @@ #. 30000 #. -#. +#. #. #. @@ -24510,5 +24500,5 @@ #. 30000 #. -#. +#. #. #. @@ -24523,5 +24513,5 @@ #. 30000 #. -#. +#. #. #. @@ -24536,5 +24526,5 @@ #. 30000 #. -#. +#. #. #. @@ -24549,7 +24539,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24559,5 +24549,5 @@ #. 50000 #. -#. +#. #. #. @@ -24566,5 +24556,5 @@ #. 50000 #. -#. +#. #. #. @@ -24574,5 +24564,5 @@ #. 50000 #. -#. +#. #. #. @@ -24582,5 +24572,5 @@ #. 50000 #. -#. +#. #. #. @@ -24590,5 +24580,5 @@ #. 50000 #. -#. +#. #. #. @@ -24598,5 +24588,5 @@ #. 50000 #. -#. +#. #. #. @@ -24606,5 +24596,5 @@ #. 50000 #. -#. +#. #. #. @@ -24614,5 +24604,5 @@ #. 50000 #. -#. +#. #. #. @@ -24622,5 +24612,5 @@ #. 50000 #. -#. +#. #. #. @@ -24630,5 +24620,5 @@ #. 50000 #. -#. +#. #. #. @@ -24638,5 +24628,5 @@ #. 50000 #. -#. +#. #. #. @@ -24646,5 +24636,5 @@ #. 50000 #. -#. +#. #. #. @@ -24654,5 +24644,5 @@ #. 50000 #. -#. +#. #. #. @@ -24672,5 +24662,5 @@ #. 50000 #. -#. +#. #. #. @@ -24685,5 +24675,5 @@ #. 50000 #. -#. +#. #. #. @@ -24696,7 +24686,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24706,5 +24696,5 @@ #. 50000 #. -#. +#. #. #. @@ -24714,5 +24704,5 @@ #. 50000 #. -#. +#. #. #. @@ -24722,5 +24712,5 @@ #. 50000 #. -#. +#. #. #. @@ -24730,5 +24720,5 @@ #. 50000 #. -#. +#. #. #. @@ -24738,5 +24728,5 @@ #. 50000 #. -#. +#. #. #. @@ -24746,5 +24736,5 @@ #. 50000 #. -#. +#. #. #. @@ -24754,5 +24744,5 @@ #. 50000 #. -#. +#. #. #. @@ -24762,5 +24752,5 @@ #. 50000 #. -#. +#. #. #. @@ -24770,5 +24760,5 @@ #. 50000 #. -#. +#. #. #. @@ -24778,5 +24768,5 @@ #. 50000 #. -#. +#. #. #. @@ -24786,5 +24776,5 @@ #. 50000 #. -#. +#. #. #. @@ -24794,5 +24784,5 @@ #. 50000 #. -#. +#. #. #. @@ -24802,5 +24792,5 @@ #. 50000 #. -#. +#. #. #. @@ -24810,5 +24800,5 @@ #. 50000 #. -#. +#. #. #. @@ -24829,5 +24819,5 @@ #. 50000 #. -#. +#. #. #. @@ -24841,7 +24831,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24851,5 +24841,5 @@ #. 50000 #. -#. +#. #. #. @@ -24859,5 +24849,5 @@ #. 50000 #. -#. +#. #. #. @@ -24867,5 +24857,5 @@ #. 50000 #. -#. +#. #. #. @@ -24875,5 +24865,5 @@ #. 50000 #. -#. +#. #. #. @@ -24883,5 +24873,5 @@ #. 50000 #. -#. +#. #. #. @@ -24891,5 +24881,5 @@ #. 50000 #. -#. +#. #. #. @@ -24899,5 +24889,5 @@ #. 50000 #. -#. +#. #. #. @@ -24914,5 +24904,5 @@ #. 50000 #. -#. +#. #. #. @@ -24922,5 +24912,5 @@ #. 50000 #. -#. +#. #. #. @@ -24930,5 +24920,5 @@ #. 50000 #. -#. +#. #. #. @@ -24938,5 +24928,5 @@ #. 50000 #. -#. +#. #. #. @@ -24946,5 +24936,5 @@ #. 50000 #. -#. +#. #. #. @@ -24954,5 +24944,5 @@ #. 50000 #. -#. +#. #. #. @@ -24962,5 +24952,5 @@ #. 50000 #. -#. +#. #. #. @@ -24970,5 +24960,5 @@ #. 50000 #. -#. +#. #. #. @@ -24978,5 +24968,5 @@ #. 50000 #. -#. +#. #. #. @@ -24986,5 +24976,5 @@ #. 50000 #. -#. +#. #. #. @@ -24994,5 +24984,5 @@ #. 50000 #. -#. +#. #. #. @@ -25002,5 +24992,5 @@ #. 50000 #. -#. +#. #. #. @@ -25019,5 +25009,5 @@ #. 50000 #. -#. +#. #. #. @@ -25027,5 +25017,5 @@ #. 50000 #. -#. +#. #. #. @@ -25034,5 +25024,5 @@ #. 50000 #. -#. +#. #. #. @@ -25042,5 +25032,5 @@ #. 50000 #. -#. +#. #. #. @@ -25050,5 +25040,5 @@ #. 50000 #. -#. +#. #. #. @@ -25058,5 +25048,5 @@ #. 50000 #. -#. +#. #. #. @@ -25065,5 +25055,5 @@ #. 50000 #. -#. +#. #. #. @@ -25073,5 +25063,5 @@ #. 50000 #. -#. +#. #. #. @@ -25081,5 +25071,5 @@ #. 50000 #. -#. +#. #. #. @@ -25089,5 +25079,5 @@ #. 50000 #. -#. +#. #. #. @@ -25097,5 +25087,5 @@ #. 50000 #. -#. +#. #. #. @@ -25104,5 +25094,5 @@ #. 50000 #. -#. +#. #. #. @@ -25111,5 +25101,5 @@ #. 50000 #. -#. +#. #. #. @@ -25118,5 +25108,5 @@ #. 50000 #. -#. +#. #. #. @@ -25125,5 +25115,5 @@ #. 50000 #. -#. +#. #. #. @@ -25132,5 +25122,5 @@ #. 50000 #. -#. +#. #. #. @@ -25139,5 +25129,5 @@ #. 50000 #. -#. +#. #. #. @@ -25146,5 +25136,5 @@ #. 50000 #. -#. +#. #. #. @@ -25153,5 +25143,5 @@ #. 50000 #. -#. +#. #. #. @@ -25160,5 +25150,5 @@ #. 50000 #. -#. +#. #. #. @@ -25167,5 +25157,5 @@ #. 50000 #. -#. +#. #. #. @@ -25174,5 +25164,5 @@ #. 50000 #. -#. +#. #. #. @@ -25181,5 +25171,5 @@ #. 50000 #. -#. +#. #. #. @@ -25188,5 +25178,5 @@ #. 50000 #. -#. +#. #. #. @@ -25196,5 +25186,5 @@ #. 50000 #. -#. +#. #. #. @@ -25204,5 +25194,5 @@ #. 50000 #. -#. +#. #. #. @@ -25212,5 +25202,5 @@ #. 50000 #. -#. +#. #. #. @@ -25220,5 +25210,5 @@ #. 50000 #. -#. +#. #. #. @@ -25228,5 +25218,5 @@ #. 50000 #. -#. +#. #. #. @@ -25236,5 +25226,5 @@ #. 50000 #. -#. +#. #. #. @@ -25244,5 +25234,5 @@ #. 50000 #. -#. +#. #. #. @@ -25252,5 +25242,5 @@ #. 50000 #. -#. +#. #. #. @@ -25260,5 +25250,5 @@ #. 50000 #. -#. +#. #. #. @@ -25269,5 +25259,5 @@ #. 50000 #. -#. +#. #. #. @@ -25277,5 +25267,5 @@ #. 50000 #. -#. +#. #. #. @@ -25285,5 +25275,5 @@ #. 50000 #. -#. +#. #. #. @@ -25293,5 +25283,5 @@ #. 50000 #. -#. +#. #. #. @@ -25301,5 +25291,5 @@ #. 50000 #. -#. +#. #. #. @@ -25309,5 +25299,5 @@ #. 50000 #. -#. +#. #. #. @@ -25317,5 +25307,5 @@ #. 50000 #. -#. +#. #. #. @@ -25325,5 +25315,5 @@ #. 50000 #. -#. +#. #. #. @@ -25333,5 +25323,5 @@ #. 50000 #. -#. +#. #. #. @@ -25341,5 +25331,5 @@ #. 50000 #. -#. +#. #. #. @@ -25349,5 +25339,5 @@ #. 50000 #. -#. +#. #. #. @@ -25357,5 +25347,5 @@ #. 50000 #. -#. +#. #. #. @@ -25365,5 +25355,5 @@ #. 50000 #. -#. +#. #. #. @@ -25373,5 +25363,5 @@ #. 50000 #. -#. +#. #. #. @@ -25381,5 +25371,5 @@ #. 50000 #. -#. +#. #. #. @@ -25389,5 +25379,5 @@ #. 50000 #. -#. +#. #. #. @@ -25397,5 +25387,5 @@ #. 50000 #. -#. +#. #. #. @@ -25405,5 +25395,5 @@ #. 50000 #. -#. +#. #. #. @@ -25413,5 +25403,5 @@ #. 50000 #. -#. +#. #. #. @@ -25420,5 +25410,5 @@ #. 50000 #. -#. +#. #. #. @@ -25450,5 +25440,5 @@ #. 50000 #. -#. +#. #. #. @@ -25458,5 +25448,5 @@ #. 50000 #. -#. +#. #. #. @@ -25466,7 +25456,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25481,5 +25471,5 @@ #. 50000 #. -#. +#. #. #. @@ -25489,5 +25479,5 @@ #. 50000 #. -#. +#. #. #. @@ -25497,5 +25487,5 @@ #. 50000 #. -#. +#. #. #. @@ -25505,5 +25495,5 @@ #. 50000 #. -#. +#. #. #. @@ -25513,5 +25503,5 @@ #. 50000 #. -#. +#. #. #. @@ -25521,5 +25511,5 @@ #. 50000 #. -#. +#. #. #. @@ -25529,5 +25519,5 @@ #. 50000 #. -#. +#. #. #. @@ -25543,7 +25533,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25553,5 +25543,5 @@ #. 50000 #. -#. +#. #. #. @@ -25561,5 +25551,5 @@ #. 50000 #. -#. +#. #. #. @@ -25569,5 +25559,5 @@ #. 50000 #. -#. +#. #. #. @@ -25577,5 +25567,5 @@ #. 50000 #. -#. +#. #. #. @@ -25585,5 +25575,5 @@ #. 50000 #. -#. +#. #. #. @@ -25593,5 +25583,5 @@ #. 50000 #. -#. +#. #. #. @@ -25601,5 +25591,5 @@ #. 50000 #. -#. +#. #. #. @@ -25609,5 +25599,5 @@ #. 50000 #. -#. +#. #. #. @@ -25617,5 +25607,5 @@ #. 50000 #. -#. +#. #. #. @@ -25625,5 +25615,5 @@ #. 50000 #. -#. +#. #. #. @@ -25633,5 +25623,5 @@ #. 50000 #. -#. +#. #. #. @@ -25641,5 +25631,5 @@ #. 50000 #. -#. +#. #. #. @@ -25649,5 +25639,5 @@ #. 50000 #. -#. +#. #. #. @@ -25657,5 +25647,5 @@ #. 50000 #. -#. +#. #. #. @@ -25665,5 +25655,5 @@ #. 50000 #. -#. +#. #. #. @@ -25673,5 +25663,5 @@ #. 50000 #. -#. +#. #. #. @@ -25681,5 +25671,5 @@ #. 50000 #. -#. +#. #. #. @@ -25689,5 +25679,5 @@ #. 50000 #. -#. +#. #. #. @@ -25697,5 +25687,5 @@ #. 50000 #. -#. +#. #. #. @@ -25705,5 +25695,5 @@ #. 50000 #. -#. +#. #. #. @@ -25713,5 +25703,5 @@ #. 50000 #. -#. +#. #. #. @@ -25721,5 +25711,5 @@ #. 50000 #. -#. +#. #. #. @@ -25729,5 +25719,5 @@ #. 50000 #. -#. +#. #. #. @@ -25737,5 +25727,5 @@ #. 50000 #. -#. +#. #. #. @@ -25745,5 +25735,5 @@ #. 50000 #. -#. +#. #. #. @@ -25753,5 +25743,5 @@ #. 50000 #. -#. +#. #. #. @@ -25761,5 +25751,5 @@ #. 50000 #. -#. +#. #. #. @@ -25769,5 +25759,5 @@ #. 50000 #. -#. +#. #. #. @@ -25777,5 +25767,5 @@ #. 50000 #. -#. +#. #. #. @@ -25785,5 +25775,5 @@ #. 50000 #. -#. +#. #. #. @@ -25793,5 +25783,5 @@ #. 50000 #. -#. +#. #. #. @@ -25801,5 +25791,5 @@ #. 50000 #. -#. +#. #. #. @@ -25809,5 +25799,5 @@ #. 50000 #. -#. +#. #. #. @@ -25817,5 +25807,5 @@ #. 50000 #. -#. +#. #. #. @@ -25825,5 +25815,5 @@ #. 50000 #. -#. +#. #. #. @@ -25833,5 +25823,5 @@ #. 50000 #. -#. +#. #. #. @@ -25841,5 +25831,5 @@ #. 50000 #. -#. +#. #. #. @@ -25849,5 +25839,5 @@ #. 50000 #. -#. +#. #. #. @@ -25857,5 +25847,5 @@ #. 50000 #. -#. +#. #. #. @@ -25865,5 +25855,5 @@ #. 50000 #. -#. +#. #. #. @@ -25873,5 +25863,5 @@ #. 50000 #. -#. +#. #. #. @@ -25881,5 +25871,5 @@ #. 50000 #. -#. +#. #. #. @@ -25915,7 +25905,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25925,5 +25915,5 @@ #. 50000 #. -#. +#. #. #. @@ -25933,5 +25923,5 @@ #. 50000 #. -#. +#. #. #. @@ -25941,5 +25931,5 @@ #. 50000 #. -#. +#. #. #. @@ -25949,5 +25939,5 @@ #. 50000 #. -#. +#. #. #. @@ -25957,5 +25947,5 @@ #. 50000 #. -#. +#. #. #. @@ -25965,5 +25955,5 @@ #. 50000 #. -#. +#. #. #. @@ -25973,5 +25963,5 @@ #. 50000 #. -#. +#. #. #. @@ -25988,5 +25978,5 @@ #. 50000 #. -#. +#. #. #. @@ -25996,5 +25986,5 @@ #. 50000 #. -#. +#. #. #. @@ -26004,5 +25994,5 @@ #. 50000 #. -#. +#. #. #. @@ -26012,5 +26002,5 @@ #. 50000 #. -#. +#. #. #. @@ -26020,5 +26010,5 @@ #. 50000 #. -#. +#. #. #. @@ -26028,5 +26018,5 @@ #. 50000 #. -#. +#. #. #. @@ -26037,5 +26027,5 @@ #. 50000 #. -#. +#. #. #. @@ -26045,5 +26035,5 @@ #. 50000 #. -#. +#. #. #. @@ -26053,5 +26043,5 @@ #. 40000 #. -#. +#. #. #. @@ -26061,5 +26051,5 @@ #. 50000 #. -#. +#. #. #. @@ -26068,5 +26058,5 @@ #. 40000 #. -#. +#. #. #. @@ -26075,5 +26065,5 @@ #. 40000 #. -#. +#. #. #. @@ -26091,7 +26081,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26101,5 +26091,5 @@ #. 50000 #. -#. +#. #. #. @@ -26109,5 +26099,5 @@ #. 50000 #. -#. +#. #. #. @@ -26117,5 +26107,5 @@ #. 50000 #. -#. +#. #. #. @@ -26125,5 +26115,5 @@ #. 50000 #. -#. +#. #. #. @@ -26133,5 +26123,5 @@ #. 50000 #. -#. +#. #. #. @@ -26141,5 +26131,5 @@ #. 50000 #. -#. +#. #. #. @@ -26149,5 +26139,5 @@ #. 50000 #. -#. +#. #. #. @@ -26157,5 +26147,5 @@ #. 50000 #. -#. +#. #. #. @@ -26165,5 +26155,5 @@ #. 50000 #. -#. +#. #. #. @@ -26182,5 +26172,5 @@ #. 50000 #. -#. +#. #. #. @@ -26194,5 +26184,5 @@ #. 50000 #. -#. +#. #. #. @@ -26206,5 +26196,5 @@ #. 50000 #. -#. +#. #. #. @@ -26214,5 +26204,5 @@ #. 50000 #. -#. +#. #. #. @@ -26226,5 +26216,5 @@ #. 50000 #. -#. +#. #. #. @@ -26238,5 +26228,5 @@ #. 50000 #. -#. +#. #. #. @@ -26250,6 +26240,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26259,5 +26249,5 @@ #. 50000 #. -#. +#. #. #. @@ -26271,5 +26261,5 @@ #. 50000 #. -#. +#. #. #. @@ -26283,5 +26273,5 @@ #. 50000 #. -#. +#. #. #. @@ -26295,5 +26285,5 @@ #. 50000 #. -#. +#. #. #. @@ -26307,5 +26297,5 @@ #. 50000 #. -#. +#. #. #. @@ -26319,5 +26309,5 @@ #. 50000 #. -#. +#. #. #. @@ -26327,7 +26317,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26337,5 +26327,5 @@ #. 50000 #. -#. +#. #. #. @@ -26345,5 +26335,5 @@ #. 50000 #. -#. +#. #. #. @@ -26353,5 +26343,5 @@ #. 50000 #. -#. +#. #. #. @@ -26361,5 +26351,5 @@ #. 50000 #. -#. +#. #. #. @@ -26376,5 +26366,5 @@ #. 50000 #. -#. +#. #. #. @@ -26387,5 +26377,5 @@ #. 50000 #. -#. +#. #. #. @@ -26399,5 +26389,5 @@ #. 50000 #. -#. +#. #. #. @@ -26411,5 +26401,5 @@ #. 50000 #. -#. +#. #. #. @@ -26423,5 +26413,5 @@ #. 50000 #. -#. +#. #. #. @@ -26432,5 +26422,5 @@ #. 50000 #. -#. +#. #. #. @@ -26440,5 +26430,5 @@ #. 50000 #. -#. +#. #. #. @@ -26448,5 +26438,5 @@ #. 50000 #. -#. +#. #. #. @@ -26456,5 +26446,5 @@ #. 50000 #. -#. +#. #. #. @@ -26464,5 +26454,5 @@ #. 50000 #. -#. +#. #. #. @@ -26479,5 +26469,5 @@ #. 50000 #. -#. +#. #. #. @@ -26491,5 +26481,5 @@ #. 50000 #. -#. +#. #. #. @@ -26503,5 +26493,5 @@ #. 50000 #. -#. +#. #. #. @@ -26515,5 +26505,5 @@ #. 50000 #. -#. +#. #. #. @@ -26527,5 +26517,5 @@ #. 50000 #. -#. +#. #. #. @@ -26539,5 +26529,5 @@ #. 50000 #. -#. +#. #. #. @@ -26546,7 +26536,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26556,5 +26546,5 @@ #. 50000 #. -#. +#. #. #. @@ -26564,5 +26554,5 @@ #. 50000 #. -#. +#. #. #. @@ -26572,5 +26562,5 @@ #. 50000 #. -#. +#. #. #. @@ -26580,5 +26570,5 @@ #. 50000 #. -#. +#. #. #. @@ -26588,5 +26578,5 @@ #. 50000 #. -#. +#. #. #. @@ -26596,5 +26586,5 @@ #. 50000 #. -#. +#. #. #. @@ -26604,5 +26594,5 @@ #. 50000 #. -#. +#. #. #. @@ -26619,7 +26609,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26629,5 +26619,5 @@ #. 50000 #. -#. +#. #. #. @@ -26637,5 +26627,5 @@ #. 50000 #. -#. +#. #. #. @@ -26645,5 +26635,5 @@ #. 50000 #. -#. +#. #. #. @@ -26653,5 +26643,5 @@ #. 50000 #. -#. +#. #. #. @@ -26667,5 +26657,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26714,5 +26704,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26722,5 +26712,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26730,5 +26720,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26738,5 +26728,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26746,5 +26736,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26754,5 +26744,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26762,5 +26752,5 @@ #. 50000 #. -#. +#. #. #. @@ -26770,5 +26760,5 @@ #. 50000 #. -#. +#. #. #. @@ -26778,5 +26768,5 @@ #. 50000 #. -#. +#. #. #. @@ -26786,5 +26776,5 @@ #. 50000 #. -#. +#. #. #. @@ -26794,5 +26784,5 @@ #. 50000 #. -#. +#. #. #. @@ -26802,5 +26792,5 @@ #. 50000 #. -#. +#. #. #. @@ -26820,5 +26810,5 @@ #. 50000 #. -#. +#. #. #. @@ -26827,5 +26817,5 @@ #. 50000 #. -#. +#. #. #. @@ -26834,5 +26824,5 @@ #. 50000 #. -#. +#. #. #. @@ -26841,5 +26831,5 @@ #. 40000 #. -#. +#. #. #. @@ -26848,5 +26838,5 @@ #. 40000 #. -#. +#. #. #. @@ -26855,5 +26845,5 @@ #. 40000 #. -#. +#. #. #. @@ -26948,5 +26938,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -26954,28 +26944,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 @@ -27090,5 +27080,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27101,5 +27091,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27124,6 +27114,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27132,6 +27122,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27146,6 +27136,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 @@ -27159,6 +27149,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 @@ -27178,6 +27168,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27201,6 +27191,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 @@ -27213,4 +27203,81 @@ msgstr "" +#~ msgid "Images for {0}" +#~ msgstr "Billeder for {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Indlæs GPX..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Intet tidspunkt for punkt {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Kan ikke læse tidspunkt \"{0}\" for punkt {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Ingen billeder med læsbare tidsstempler fundet" + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS-start: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS-slut: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "nuværende forskel: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "tidszone-forskel: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} inden for sporet." + +#~ msgid "Sync clock" +#~ msgstr "Synkronisér ur" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Datoen i filen \"{0}\" kunne ikke forstås." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"." + +#~ msgid "Image" +#~ msgstr "Billede" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "GPS-enhedens tidszone (forskel fra foto)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synkronisér tidspunkt med GPS-enhed" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Den indtastede tid kunne ikke forstås." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Geotaggede billeder" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Åbn billeder med AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "osmarender-indstillinger" + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Endnu en geotag-udvidelse for JOSM. Sammeholder billeder med GPS-spor " +#~ "samt importerer EXIF-geotaggede billeder." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Adskillige funktioner, der gør dit arbejde lettere: Fx forenkl vej, " +#~ "sammensæt områder, spring til position." + #~ msgid "Move" #~ msgstr "Flyt" @@ -27222,5 +27289,4 @@ #~ msgstr "Filen kunne ikke findes." -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Send venligst en fejlrapport på {0}" @@ -27259,5 +27325,4 @@ #~ msgstr "Overførsel er afbrudt grundet en fejl (venter i fem sekunder)" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Udvidelse kræver en JOSM-opdatering: {0}." @@ -27312,15 +27377,11 @@ #~ msgstr "OSM-brugernavn (e-mail)" -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Fejl ved sletning af udvidelsesfil: {0}" - #~ msgid "Plugin already exists" #~ msgstr "Udvidelsen findes allerede" -#, java-format #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} udvidelse blev succesfuldt opdateret. Genstart venligst JOSM." +#~ msgstr[0] "" +#~ "{0} udvidelse blev succesfuldt opdateret. Genstart venligst JOSM." #~ msgstr[1] "" #~ "{0} udvidelser blev succesfuldt opdateret. Genstart venligst JOSM." @@ -27335,5 +27396,4 @@ #~ msgstr "udredet udgave:" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27347,16 +27407,10 @@ #~ msgstr "Filen blev ikke fundet" -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Kunne ikke hente udvidelsen {0} fra {1}" -#, java-format #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "Løs {0} konflikter i {1} objekter" -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Slet {1} {0}" - #~ msgid "Split way segment" #~ msgstr "Opdel vejstykke" @@ -27380,5 +27434,4 @@ #~ msgstr "Kan kun redigere hjælpesider fra JOSM Online-hjælp" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Fejl ved indlæsning af siden {0}" @@ -27394,6 +27447,6 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" #~ "De valgte veje hører til forskellige relationer. Vil du stadigvæk " @@ -27452,15 +27505,10 @@ #~ "setting the config option 'pluginmanager.warntime'.)" #~ msgstr "" -#~ "(Du kan rette antallet af dage mellem denne advarsel vises
ved at rette i " -#~ "indstillingen 'pluginmanager.warntime'.)" - -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Indtast venligst først de ønskede koordinater." - -#, java-format +#~ "(Du kan rette antallet af dage mellem denne advarsel vises
ved at " +#~ "rette i indstillingen 'pluginmanager.warntime'.)" + #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Brug forudindstilling \"{0}\" af gruppe \"{1}\"" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Brug forudindstilling \"{0}\"" @@ -27476,6 +27524,6 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" #~ "Prøv at opdatere til nyeste udgave af JOSM og alle udvidelser, før du " @@ -27502,10 +27550,10 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" -#~ "ADVARSEL: Kodeordet er gemt i klar tekst.
Det bliver sendt i klar " -#~ "tekst til serveren, integreret i URLen.

Brug ikke et værdifuldt " -#~ "kodeord." +#~ "ADVARSEL: Kodeordet er gemt i klar tekst.
Det bliver sendt i " +#~ "klar tekst til serveren, integreret i URLen.

Brug ikke et " +#~ "værdifuldt kodeord." #~ msgid "Add either site-josm.xml or Wiki Pages." @@ -27515,7 +27563,7 @@ #~ msgstr "Modstridende relation" -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "Udvidelsen {0} forekommer itu eller kunne ikke hentes automatisk." @@ -27559,5 +27607,4 @@ #~ msgstr "Tomt medlem i relation." -#, java-format #~ msgid "requested: {0}" #~ msgstr "anmodet: {0}" @@ -27572,5 +27619,4 @@ #~ msgstr "Vælg venligst en bruger fra forfatter-panelet" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Forfattere: {0}" @@ -27585,10 +27631,8 @@ #~ msgstr "Elementets historik" -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "" #~ "Ignorerer en vej fordi den inkluderer et punkt, som ikke eksisterer: {0}\n" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Konflikter: {0}" @@ -27600,5 +27644,4 @@ #~ msgstr "Vælg venligst veje med næsten rette vinkler at gøre retvinklet." -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -27607,6 +27650,6 @@ #~ "{0}" #~ msgstr "" -#~ "Arkivet over udvidelser er allerede tilgængeligt. Vil du hente den nuværende " -#~ "version ved at slette det eksisterende arkiv?\n" +#~ "Arkivet over udvidelser er allerede tilgængeligt. Vil du hente den " +#~ "nuværende version ved at slette det eksisterende arkiv?\n" #~ "\n" #~ "{0}" @@ -27634,14 +27677,13 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" -#~ "Returnér alle valgte objekter til den version, der er valgt i historiklisten." - -#, java-format +#~ "Returnér alle valgte objekter til den version, der er valgt i " +#~ "historiklisten." + #~ msgid "Relation Editor: {0}" #~ msgstr "Relations-editor: {0}" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Kan ikke åbne mappen for indstillinger: {0}" @@ -27659,5 +27701,4 @@ #~ msgstr "Kun to punkter er tilladt." -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -27701,6 +27742,6 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" #~ "De valgte punkter tilhører forskellige relationer. Vil du stadigvæk " @@ -27711,6 +27752,6 @@ #~ "elements have a history." #~ msgstr "" -#~ "Vælg mindst ét punkt, vej eller relation. Kun allerede uploadede elementer " -#~ "har en historik." +#~ "Vælg mindst ét punkt, vej eller relation. Kun allerede uploadede " +#~ "elementer har en historik." #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" @@ -27718,6 +27759,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -27734,6 +27775,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example,replacing 73 with your image id: \n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -27756,25 +27797,29 @@ #~ "format=image/jpeg \n" #~ "\n" -#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ skal du " -#~ "kun bruge det relevante 'id' som input..\n" -#~ "Vil du tilføje et Metacarta Map Rectifier-menupunkt manuelt, opret da en URL " -#~ "manuelt som i dette eksempel, hvor du erstatter 63 med dit billede-id: \n" +#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ skal " +#~ "du kun bruge det relevante 'id' som input..\n" +#~ "Vil du tilføje et Metacarta Map Rectifier-menupunkt manuelt, opret da en " +#~ "URL manuelt som i dette eksempel, hvor du erstatter 63 med dit billede-" +#~ "id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" #~ " \n" #~ "Bemærk: Vær sikker på at billedet er hensigtsmæssigt at bruge ud fra " -#~ "ophavsretsmæssige betragtninger. Er du i tvivl, så undlad at bruge billedet." +#~ "ophavsretsmæssige betragtninger. Er du i tvivl, så undlad at bruge " +#~ "billedet." #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" -#~ "Intet data til opdatering. Har du allerede åbnet eller downloadet et datalag?" +#~ "Intet data til opdatering. Har du allerede åbnet eller downloadet et " +#~ "datalag?" #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" -#~ "Intern fejl: kan ikke tjekke omstændighederne for manglende lag. Rapportér " -#~ "venligst dette som en fejl." +#~ "Intern fejl: kan ikke tjekke omstændighederne for manglende lag. " +#~ "Rapportér venligst dette som en fejl." #~ msgid "Lambert Zone 3 cache file (.3)" @@ -27808,5 +27853,4 @@ #~ msgstr "vandrekort" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27822,5 +27866,4 @@ #~ "Upload ikke noget data efter denne besked." -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "Skift først projiceringen til {0}." @@ -27829,5 +27872,4 @@ #~ msgstr "Ugyldig projicering" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27844,5 +27886,4 @@ #~ "Upload ikke noget data efter denne besked." -#, java-format #~ msgid "Checking whether node {0} is gone ..." #~ msgstr "Tjekker om punktet {0} er væk ..." @@ -27851,5 +27892,4 @@ #~ msgstr "Gendanner relation..." -#, java-format #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Tjekker om primitiven {0} er væk ..." @@ -27909,5 +27949,4 @@ #~ msgstr "Hent tilknytninger fra OSM..." -#, java-format #~ msgid "" #~ "There are unsaved changes in {0} layer. Discard the changes and continue?" @@ -27919,12 +27958,10 @@ #~ "Der er ugemte ændringer i {0} lag. Smid ændringerne væk og fortsæt?" -#, java-format #~ msgid "Help page missing. Create it in English." #~ msgstr "Hjælpesiden mangler. Opret den på engelsk" -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" #~ "Hjælpesiden mangler. Opret den på engelsk eller English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" #~ "Hjælpesiden mangler. Opret den på . eller i dit eget sprog." -#, java-format #~ msgid "Unexpected return value. Got {0}." #~ msgstr "uventet svar. Modtog {0}" Index: /applications/editors/josm/i18n/po/de.po =================================================================== --- /applications/editors/josm/i18n/po/de.po (revision 18974) +++ /applications/editors/josm/i18n/po/de.po (revision 18975) @@ -9,7 +9,7 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 16:20+0100\n" -"PO-Revision-Date: 2009-11-29 18:54+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-12-01 12:37+0000\n" +"Last-Translator: vsandre \n" "Language-Team: Deutsch\n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:05+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:17+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" @@ -109,6 +108,6 @@ msgid "Could not read file ''{0}''.
Error is:
{1}" msgstr "" -"Datei \"{0}\" kann nicht gelesen werden.
Fehler lautet: " -"
{1}" +"Datei \"{0}\" kann nicht gelesen werden.
Fehler lautet:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -119,5 +118,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 @@ -140,9 +139,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 @@ -158,20 +157,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 @@ -190,7 +185,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 "Fehler" @@ -270,5 +265,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 "Plugins" @@ -316,4 +311,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 @@ -321,8 +318,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 @@ -332,29 +329,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 @@ -385,6 +380,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 "" "Es gibt keine Ebene mit der die Ausgangsebene
''{0}''
vereint " @@ -438,14 +433,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 "Breitengrad" #: ../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 "Längengrad" @@ -471,10 +466,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 @@ -505,19 +500,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 @@ -526,9 +524,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 @@ -544,7 +539,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 @@ -556,11 +551,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" @@ -648,5 +643,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}" @@ -701,10 +696,10 @@ "Reihenfolge gebracht werden)" -#: ../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} Wege verbinden" -#: ../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 "Bitte wählen Sie mindestens zwei Wege zum Verbinden." @@ -723,19 +718,19 @@ msgstr "Bitte etwas zum Kopieren auswählen." +#: ../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 "Kreis erstellen" -#: ../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 "Einen Kreis aus drei ausgewählten Knoten erstellen." -#: ../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 "Diese Knoten sind nicht in einem Kreis angeordnet. Abbruch." -#: ../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 " @@ -748,9 +743,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 @@ -822,21 +817,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" @@ -844,6 +843,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 @@ -872,5 +871,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 "Duplizieren" @@ -927,8 +926,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 @@ -936,5 +933,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 @@ -947,8 +944,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 @@ -967,8 +964,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 @@ -991,13 +988,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 @@ -1038,4 +1036,106 @@ msgstr "Informationen über Wege, Knoten oder Relationen anzeigen" +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "Überlappende Flächen verbinden" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Joins areas that overlap each other" +msgstr "Sich überlappende Flächen miteinander verbinden" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +msgid "Only up to two areas can be joined at the moment." +msgstr "Momentan können nur maximal zwei Flächen vereinigt werden." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#, java-format +msgid "\"{0}\" is not closed and therefore can't be joined." +msgstr "\"{0}\" ist nicht geschlossen und kann deshalb nicht vereinigt werden." + +#: ../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 "" +"Die ausgewählten Wege haben Knoten außerhalb des heruntergeladenen " +"Datenbereichs.\n" +"Das kann zu unabsichtlich gelöschten Knoten führen.\n" +"Sind Sie sich sicher, dass Sie fortfahren wollen?" + +#: ../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 "Bitte abbrechen, falls Sie nicht sicher sind" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 +msgid "Please select at least one closed way the should be joined." +msgstr "Bitte mindestens einen geschlossenen Weg zum Vereinigen wählen." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +msgid "No intersection found. Nothing was changed." +msgstr "Keine Überschneidung gefunden. Es wurde nichts geändert." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +msgid "Added node on all intersections" +msgstr "Knoten auf allen Schnittpunkten erstellt" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgid "Delete Ways that are not part of an inner multipolygon" +msgstr "Wege entfernen, die nicht teil des inneren Multipolygons sind" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +msgid "Fix relations" +msgstr "Relationen korrigieren" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgid "Joined self-overlapping area" +msgstr "Selbstüberlappende Gebiete verbunden" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +msgid "Joined overlapping areas" +msgstr "Überlappende Gebiete verbunden" + +#: ../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 "" +"Einige der Wege waren Teil von Relationen, welche geändert wurden. Bitte " +"prüfen Sie, dass keine Fehler entstanden sind." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +msgid "Enter values for all conflicts." +msgstr "Werte für alle Konflikte festlegen." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Konflikte auflösen" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +msgid "Fix tag conflicts" +msgstr "Merkmalskonflikte beheben" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +msgid "Removed Element from Relations" +msgstr "Elemente aus Relationen entfernt" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +msgid "Join Areas: Remove Short Ways" +msgstr "Flächen verbinden: Kurze Wege entfernen" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +msgid "Closed Way" +msgstr "Weg geschlossen" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgid "Remove tags from inner ways" +msgstr "Merkmale von inneren Wegen entfernen" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +msgid "Join Areas Function" +msgstr "Funktion zum Flächen verbinden" + #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 @@ -1055,4 +1155,45 @@ msgstr "Kein Tastenkürzel" +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Jump To Position" +msgstr "Zu Position springen" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Opens a dialog that allows to jump to a specific location" +msgstr "Einen Dialog zum Springen an eine spezifische Position öffnen" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57 +msgid "Enter Lat/Lon to jump to position." +msgstr "Länge und Breite der Sprungposition angeben." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 +msgid "You can also paste an URL from www.openstreetmap.org" +msgstr "Sie können auch eine URL von www.openstreetmap.org einfügen" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 +msgid "Zoom (in metres)" +msgstr "Zoom (in Meter)" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 +msgid "URL" +msgstr "URL" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 +msgid "Jump there" +msgstr "Dorthin springen" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 +msgid "Jump to Position" +msgstr "Zu Position springen" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Could not parse Latitude, Longitude or Zoom. Please check." +msgstr "Länge, Breite oderZoom konnten nicht gelesen werden. Bitte prüfen." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Unable to parse Lon/Lat" +msgstr "Länge oder Breite nicht lesbar" + #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" @@ -1063,26 +1204,26 @@ msgstr "Aktuelle Ebene mit einer anderen zusammenführen" +#: ../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 "Knotenpunkte vereinigen" -#: ../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 "Mehrere Knotenpunkte zum ältesten vereinigen." -#: ../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 "Bitte mindestens zwei Knotenpunkte zum Vereinigen wählen." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126 msgid "Abort Merging" msgstr "Vereinigen abbrechen" -#: ../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 "Klicken, um das Vereinigen abzubrechen" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135 #, java-format msgid "" @@ -1092,5 +1233,5 @@ "benutzte Weg ''{0}'' gelöscht werden." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231 #, java-format msgid "Merge {0} nodes" @@ -1311,6 +1452,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "" -"Merkmale aus der Zwischenablage allen ausgewählten Elementen zuweisen." +msgstr "Merkmale aus der Zwischenablage allen ausgewählten Elementen zuweisen." #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 @@ -1472,6 +1612,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 "" "Statusübersicht mit nützlichen Informationen für Fehlerberichte anzeigen" @@ -1492,9 +1631,45 @@ #: ../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 "Schließen" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Weg vereinfachen" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Unnötige Knotenpunkte eines Weges löschen." + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "Bitte mindestens einen Weg zum Vereinfachen auswählen." + +#: ../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] "" +"Diese Auswahl enthält {0} Weg. Sind Sie sich, dass er vereinfacht werden " +"soll?" +msgstr[1] "" +"Diese Auswahl enthält {0} Wege. Sind Sie sich, dass alle vereinfacht werden " +"sollen?" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 +msgid "Are you sure?" +msgstr "Sind Sie sicher?" + +#: ../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] "Weg vereinfachen ({0} Knoten entfernen)" +msgstr[1] "Weg vereinfachen ({0} Knoten entfernen)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1514,6 +1689,5 @@ msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." -msgstr[0] "" -"Der gewählte Knotenpunkt ist kein innenliegender Teil eines Weges." +msgstr[0] "Der gewählte Knotenpunkt ist kein innenliegender Teil eines Weges." msgstr[1] "Die gewählten Knotenpunkte sind nicht Teil eines Weges." @@ -1630,6 +1804,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 "" "* Ein Knoten, der von mehr als einem Weg genutzt wird und einen dieser Wege, " @@ -1716,24 +1889,24 @@ #. 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 "Daten herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "No current dataset found" msgstr "Aktueller Datensatz wurde nicht gefunden" -#: ../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 "Kein Objekt mit der ID {0} im aktuellen Datensatz gefunden" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Update selection" msgstr "Auswahl aktualisieren" -#: ../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)" @@ -1742,31 +1915,30 @@ "herunterladen)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 msgid "Update Selection" msgstr "Auswahl aktualisieren" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 msgid "There are no selected objects to update." msgstr "Es sind keine Objekte zur Aktualisierung ausgewählt." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "Selection empty" msgstr "Auswahl leer" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 msgid "Update objects" msgstr "Objekte aktualisieren" -#: ../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 "Daten hochladen" -#: ../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 "" -"Alle Änderungen in der aktuellen Datenebene zum OSM-Server hochladen." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 +msgstr "Alle Änderungen in der aktuellen Datenebene zum OSM-Server hochladen." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 #, java-format msgid "" @@ -1777,35 +1949,35 @@ "gelöst werden müssen." -#: ../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 "Keine Änderungen zum Hochladen vorhanden." -#: ../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 "Nichts geändert. Erfassen Sie erst einige Daten." -#: ../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 "Nur Knoten {0} synchronisieren" -#: ../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 "Nur Weg {0} synchronisieren" -#: ../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 "Nur Relation {0} synchronisieren" -#: ../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 "Ganzen Datensatz synchronisieren" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1813,33 +1985,31 @@ "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.
" +"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 "" "Hochladen fehlgeschlagen, da der Server eine neuere " "Version
von einem Ihrer Knoten, Wege oder Relationen hat.
Der Konflikt " -"wird durch ein Objekt vom Typ {0} mit ID " -"{1} ausgelöst.
Der Server hat Version {2}, Ihre Version " -"ist {3}.
Wählen Sie {4}, um dieses Objekt zu " -"synchronisieren.
Wählen Sie {5}, um den kompletten " -"lokalen Datensatz mit dem Server zu synchronisieren.
Wählen Sie " -"{6}, um abzubrechen und weiterzuarbeiten." - -#: ../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 +"wird durch ein Objekt vom Typ {0} mit ID {1} ausgelöst.
Der Server hat Version {2}, Ihre Version ist {3}." +"
Wählen Sie {4}, um dieses Objekt zu synchronisieren." +"
Wählen Sie {5}, um den kompletten lokalen Datensatz mit " +"dem Server zu synchronisieren.
Wählen Sie {6}, um " +"abzubrechen und weiterzuarbeiten." + +#: ../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 "Konflikte gefunden" -#: ../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.
" +"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 "" "Hochladen fehlgeschlagen, da der Server eine neuere " @@ -1849,5 +2019,5 @@ "weiterzuarbeiten." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1858,26 +2028,25 @@ "Hochladen fehlgeschlagen, da der " "verwendete
Änderungssatz {0} bereits am {1} geschlossen wurde.
Bitte " -"in einen neuen oder in einen vorhandenen, offenen Änderungssatz " -"hochladen." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 +"in einen neuen oder in einen vorhandenen, offenen Änderungssatz hochladen." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 msgid "Changeset closed" msgstr "Änderungssatz geschlossen" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 msgid "Prepare conflict resolution" msgstr "Bereinigen von Konflikten vorbereiten" -#: ../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 "Klicken, um alle Wege mit dem Knoten {0} zu laden" -#: ../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 "" -"Klicken, um abzubrechen und das Editieren der Karte wiederaufzunehmen" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +msgstr "Klicken, um abzubrechen und das Editieren der Karte wiederaufzunehmen" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 #, java-format msgid "" @@ -1888,15 +2057,15 @@ msgstr "" "Hochladen ist fehlgeschlagen, weil der zu löschende " -"Knoten {0} noch im Weg {1} verwendet wird.

Klicken Sie " -"{2}, um alle Wege mit dem Knoten {0} zu laden.
Falls " -"nötig wird JOSM Konflikte erstellen. Sie können diese anschließend im " +"Knoten {0} noch im Weg {1} verwendet wird.

Klicken Sie {2}, um alle Wege mit dem Knoten {0} zu laden.
Falls nötig wird JOSM " +"Konflikte erstellen. Sie können diese anschließend im " "Konfliktbearbeitungsdialog bereinigen." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 msgid "Node still in use" msgstr "Ein Knoten wird noch benutzt" -#: ../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" @@ -1905,5 +2074,5 @@ "überein" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 msgid "Updating primitive" msgstr "Objekt aktualisieren" @@ -1915,6 +2084,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 "" @@ -1925,5 +2094,5 @@ "dieses Objekt und fahre mit dem Hochladen fort." -#: ../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." @@ -1932,35 +2101,34 @@ "Objekt beim Hochladen." -#: ../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 "Übertrage {0} Objekte zum Server ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 -#, java-format -msgid "" -"Ignoring caught exception because upload is canceled. Exception is: {0}" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" msgstr "" "Der Fehler wird ignoriert, da das Herunterladen abgebrochen wurde. Die " "Fehlermeldung war: {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 msgid "Upload selection" msgstr "Auswahl hochladen" -#: ../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 "Alle Änderungen in der aktuellen Auswahl zum OSM-Server hochladen." -#: ../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 "Elternobjekte auf gelöschte Objekten prüfen." -#: ../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 "Eltern von ''{0}'' lesen" -#: ../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 "Im lokalen Datensatz auf gelöschte Elternobjekte prüfen" @@ -2128,6 +2296,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 "" "Im lokalen Datensatz befinden sich {0} Elemente welche auf dem Server " @@ -2204,38 +2372,38 @@ msgstr "Ausgewählt" -#: ../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 "Kann keinen Knoten außerhalb der Welt erstellen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Knotenpunkt hinzufügen" -#: ../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 "Knotenpunkt in einen Weg einfügen" -#: ../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 "Existierenden Weg mit Knotenpunkt verbinden" -#: ../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 "Einen Knotenpunkt in einen bestehenden Weg einfügen" -#: ../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 "Knotenpunkt in einen Weg einfügen und verbinden" -#: ../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 "Einen neuen Knoten erstellen." -#: ../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 "Knoten unter Mauszeiger wählen." -#: ../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." @@ -2244,14 +2412,14 @@ msgstr[1] "Neuen Knoten in {0} Wege einfügen." -#: ../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 "Neuen Weg an letztem Knoten beginnen." -#: ../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 "Weg am letzten Knoten fortsetzen." -#: ../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 "Zeichnen beenden." @@ -2291,6 +2459,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 "" "Abspielposition in der Nähe einer GPS-Spur ablegen, um Audio abzuspielen. " @@ -2396,5 +2564,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." @@ -2483,12 +2651,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - Alle von diesem Nutzer geänderten Objekte" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - Objekte mit der angegebenen ID (0 für neue Objekte)" -#: ../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 "nodes:... - Objekte mit gegebener Knotenanzahl" -#: ../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-" @@ -2498,21 +2671,21 @@ "oder tags: min-max)" -#: ../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 "modified - Alle geänderten Objekte" -#: ../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 "selected - Alle ausgewählten Objekte" -#: ../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 "incomplete - Alle unvollständigen Objekte" -#: ../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 "untagged - Alle Objekte ohne Merkmale" -#: ../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" @@ -2521,5 +2694,5 @@ "Ausdrucks" -#: ../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" @@ -2528,19 +2701,19 @@ "Ausdrucks" -#: ../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 "" "Nutzung von | oder OR zum Kombinieren mittels logischem Oder." -#: ../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 "" "Nutzung von \" zum Zusammenfassen (z.B. falls ein Schlüssel : enthält)" -#: ../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 "Nutzung von ( und ) zum Gruppieren von Ausdrücken." -#: ../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 @@ -2550,33 +2723,33 @@ msgstr "Filter" -#: ../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 "Suche" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Submit filter" msgstr "Filter bestätigen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Start Search" msgstr "Suche starten" -#: ../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 "Nichts gefunden für Suche ''{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 "Nichts zur Auswahl hinzugefügt durch Suche nach ''{0}''" -#: ../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 "Nichts aus der Auswahl entfernt durch Suche ''{0}''" -#: ../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}''" @@ -2584,22 +2757,22 @@ "Bei der Suche nach \"{0}\" konnte in der Auswahl nichts gefunden werden." -#: ../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} Treffer gefunden" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2612,15 +2785,15 @@ "{2}" -#: ../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 "" "Schlüssel kann bei Gleichheitsoperator nicht leer sein. Beispiel: feld=wert" -#: ../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 "Syntaxfehler im Muster: Muster {0} in {1} ist ungültig!" -#: ../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" @@ -2629,26 +2802,26 @@ "\"relation\"." -#: ../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 "Unerwartete Daten: {0}" -#: ../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 "Fehlendes Argument für 'OR'." -#: ../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 "Fehlendes Argument für 'NICHT'." -#: ../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 "Schließende Klammer erwartet." -#: ../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 "Falsche Anzahl an Parametern für Merkmalsoperator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 #, java-format msgid "" @@ -2659,9 +2832,9 @@ "oder -bereich, z.B. \"tags: 1\" oder \"tags:2-5\"." -#: ../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 "Falsche Anzahl an Parametern für Knoten-Operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 #, java-format msgid "" @@ -2672,5 +2845,5 @@ "oder -bereich, z.B. \"nodes:1-20\"." -#: ../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." @@ -2721,8 +2894,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" +#, fuzzy, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" msgstr "" "Warnung: Der Wert des Merkmals \"{0}\" des gelöschten Objekts {1} wird " @@ -2730,7 +2902,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2871,9 +3043,9 @@ "conflict can't be added." msgstr "" -"Ebene ''{0}'' enthält bereits einen Konflikt für " -"Objekt
''{1}''.
Dieser Konflikt kann nicht hinzugefügt werden." +"Ebene ''{0}'' enthält bereits einen Konflikt für Objekt
''{1}''." +"
Dieser Konflikt kann nicht hinzugefügt werden." #: ../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 "Doppelter Konflikt" @@ -2894,5 +3066,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 "" @@ -2913,11 +3086,11 @@ msgstr "Kann unentschiedenen Konflikt nicht auflösen" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 +#: ../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 "Parameter \"{0}\" darf nicht leer sein" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 msgid "At least one object to delete required, got empty collection" msgstr "" @@ -2925,5 +3098,5 @@ "Menge erhalten" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:107 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 msgid "At least one object to delete requird, got empty collection" msgstr "" @@ -2931,5 +3104,5 @@ "Menge erhalten" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177 #, java-format msgid "Delete {0} object" @@ -2938,5 +3111,5 @@ msgstr[1] "{0} Objekte löschen" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2945,5 +3118,5 @@ msgstr[1] "{0} Knoten löschen" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2952,5 +3125,5 @@ msgstr[1] "{0} Wege löschen" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2961,16 +3134,16 @@ #. 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 "" -"Sie sind dabei Knoten außerhalb des heruntergeladenen Bereichs zu " -"löschen.
Das kann zu Problemen führen, wenn andere Objekte (die Sie nicht " -"sehen) diese verwenden.
Wollen Sie die Knoten wirklich löschen?" - -#: ../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 "" +"Sie sind dabei Knoten außerhalb des heruntergeladenen Bereichs zu löschen." +"
Das kann zu Problemen führen, wenn andere Objekte (die Sie nicht sehen) " +"diese verwenden.
Wollen Sie die Knoten wirklich löschen?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "Löschbestätigung" @@ -2988,15 +3161,15 @@ msgstr[1] "{0} Knoten bewegen" -#: ../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 "Das Objekt ''{0}'' wurde entfernt" -#: ../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 "{0} Objekte wurden entfernt" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154 #, java-format msgid "" @@ -3007,5 +3180,5 @@ "werden aber min. 2 Knotenpunkte benötigt." -#: ../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}" @@ -3016,11 +3189,4 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Konflikte in der Elementenliste für Relation {0} auflösen" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "" -"Kommando \"{0}\" kann nicht rückgängig gemacht werden, da die Ebene \"{1}\" " -"nicht mehr existiert." #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3099,5 +3265,5 @@ msgstr "Anwenden?" -#: ../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 " @@ -3257,6 +3423,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 "" "Die Einstellungsdatei enthielt Fehler.
Ein Backup der alten Datei " @@ -3354,5 +3520,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3361,5 +3527,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3367,25 +3533,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 "S" #. 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 "N" #. 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 "W" #. 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 "O" #: ../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 @@ -3414,5 +3580,5 @@ #: ../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}" @@ -3420,5 +3586,13 @@ "Beim Zusammenführen wurde der Ziel-Weg für den Weg mit ID {0} nicht gefunden" -#: ../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 "" +"Beim Zusammenführen wurde der Ziel-Knoten für den Knnoten mit ID {0} nicht " +"gefunden" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 #, java-format msgid "Missing merge target for object with id {0}" @@ -3427,12 +3601,5 @@ "gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 -#, java-format -msgid "Missing merge target for node with id {0}" -msgstr "" -"Beim Zusammenführen wurde der Ziel-Knoten für den Knnoten mit ID {0} nicht " -"gefunden" - -#: ../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}" @@ -3441,5 +3608,5 @@ "nicht gefunden" -#: ../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}" @@ -3449,6 +3616,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 "" @@ -3514,24 +3681,24 @@ msgstr "F" -#: ../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 "ID >= 0 erwartet, jedoch {0} erhalten." -#: ../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 "Ein Objekt mit ID=0 darf nicht unsichtbar sein" -#: ../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 "ID >= 0 erwartet, jedoch {0} erhalten." -#: ../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 "Version > 0 erwartet, jedoch {0} erhalten." -#: ../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 " @@ -3541,5 +3708,5 @@ "andere aber nicht." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 #, java-format msgid "" @@ -3580,6 +3747,6 @@ "wurde gefunden" -#: ../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}." @@ -3602,5 +3769,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 @@ -3612,6 +3778,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 "" "Das Objekt mit der ID \"{0}\" kann nicht mit dem Objekt mit der ID \"{1}\" " @@ -3624,135 +3789,135 @@ msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}" -#: ../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 "Flächenförmiger Weg ist nicht geschlossen." -#: ../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 "Multipolygon-Weg ''{0}'' ist nicht geschlossen." -#: ../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 "Gelöschtes Element ''{0}'' in der Relation." -#: ../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 "Weg ''{0}'' mit weniger als zwei Knoten." -#: ../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 "Mehr als ein Weg mit \"from\" gefunden." -#: ../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 "Mehr als ein Weg mit \"to\" gefunden." -#: ../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 "Mehr als ein Element mit \"via\" gefunden." -#: ../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 "Unbekannte Role \"{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 "Unbekannter Elementtyp für \"{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 "Kein \"from\"-Weg gefunden." -#: ../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 "Kein \"to\"-Weg gefunden." -#: ../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 "Kein \"via\"-Knoten oder Weg gefunden." -#: ../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 "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../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 "Der \"to\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg." -#: ../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 "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg." -#: ../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 "Kein Zeichenstil für Abbiegeregel {0} gefunden." -#: ../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 "Die Wege ''{0}'' und {1}'' kreuzen sich." -#: ../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 "Innerer Weg \"{0}\" ist außerhalb." -#: ../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 "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"." -#: ../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 "Nicht-Weg ''{0}'' im Multipolygon." -#: ../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 "Kein äußerer Weg im Multipolygon ''{0}''." -#: ../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 "Zeichenstil des inneren Weges''{0}'' entspricht dem Multipolygon." -#: ../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 "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein." -#: ../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 "Ohne Merkmale" -#: ../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 "Text" -#: ../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 "Flächentext" -#: ../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 "Fehler: {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}" @@ -3764,5 +3929,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 @@ -3781,5 +3946,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 @@ -3799,5 +3964,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 "Hintergrund" @@ -3917,6 +4082,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 "" "Lesezeichen konnten nicht von
\"{0}\"
gelesen werden. Der " @@ -3933,5 +4097,5 @@ msgstr "Nicht noch einmal zeigen" -#: ../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 @@ -3939,32 +4103,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 "unvollständig" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "Straße" -#: ../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 "Eisenbahn" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "Gewässer" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "Landfläche" -#: ../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" @@ -3973,5 +4137,5 @@ msgstr[1] "{0} Knoten" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -4199,6 +4363,6 @@ msgstr "" "Parameter werden in der Reihenfolge ausgewertet, in der sie angegeben " -"werden. Stellen Sie also sicher, dass Daten existieren, bevor der Parameter -" -"-selection verwendet wird." +"werden. Stellen Sie also sicher, dass Daten existieren, bevor der Parameter " +"--selection verwendet wird." #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 @@ -4225,15 +4389,14 @@ #, java-format msgid "Preference setting {0} has been removed since it is no longer used." -msgstr "" -"Einstellung {0} wird nicht länger benutzt und wurde deshalb entfernt." - -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +msgstr "Einstellung {0} wird nicht länger benutzt und wurde deshalb entfernt." + +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Datei" -#: ../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 @@ -4247,19 +4410,19 @@ msgstr "Bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Ansicht" -#: ../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 "Werkzeuge" -#: ../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 "Vorlagen" -#: ../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 @@ -4270,5 +4433,5 @@ msgstr "Menü: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Audio" @@ -4312,29 +4475,29 @@ msgstr "Skala" -#: ../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 "Die geographische Länge an der Mausposition." -#: ../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 "Der Name des Objekts unter der Mausposition." -#: ../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 "Die geographische Breite an der Mausposition." -#: ../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 "Der Winkel zwischen vorherigem und aktuellem Wegabschnitt." -#: ../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 "Die (Kompass-)Richtung des zu zeichnenden Wegabschnittes." -#: ../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 "Die Länge des neu zu zeichnenden Wegabschnittes." -#: ../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 " @@ -4344,9 +4507,9 @@ "halten, um mit der Maus aus der Liste zu wählen.
" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(kein Objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "Nutzer:" @@ -4414,6 +4577,6 @@ "relations." msgstr "" -"Bitte bestätigen Sie, dass {0} Objekte aus " -"{1} Relationen entfernt werden sollen." +"Bitte bestätigen Sie, dass {0} Objekte aus " +"{1} Relationen entfernt werden sollen." #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 @@ -4463,5 +4626,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" @@ -4470,5 +4633,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" @@ -4477,5 +4640,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" @@ -4494,5 +4657,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 @@ -4509,5 +4672,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" @@ -4583,22 +4746,22 @@ msgstr "Konfliktlösung" -#: ../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 "Parameter \"current\" außerhalb des Bereichs: Wert ist {0}" -#: ../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 "Liste in Role {0} nimmt aktuell nicht an einem Vergleichspaar teil." -#: ../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 "Parameter \"index\" hat unerwarteten Wert {0}." -#: ../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." @@ -4687,6 +4850,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 "" "Kopiere deren gewählte Elemente an das Ende der Liste vereinigter Elemente." @@ -4761,14 +4923,13 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." -msgstr "" -"Wähle {0} um das Vereinigen zu beginnen." +"Click {0} to start merging my and their entries." +msgstr "Wähle {0} um das Vereinigen zu beginnen." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" "Wähle {0} um das Vereinigen abzuschließen." @@ -4830,6 +4991,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 "" "Fehler bei der Kommunikation mit dem Server
Details: {0}" @@ -4866,7 +5027,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 "" "Es gibt {0} zusätzliche Objekte, die in Beziehung zu {1} stehen
" @@ -5022,5 +5183,5 @@ msgstr "Objekt" -#: ../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 "" @@ -5106,11 +5267,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" -"Behalte die ausgewählten Schlüssel/Wert-Kombination der lokalen Daten." +msgstr "Behalte die ausgewählten Schlüssel/Wert-Kombination der lokalen Daten." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" -msgstr "" -"Behalte die ausgewählten Schlüssel/Wert-Kombination der Server-Daten." +msgstr "Behalte die ausgewählten Schlüssel/Wert-Kombination der Server-Daten." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 @@ -5159,5 +5318,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 "Übernehmen" @@ -5260,7 +5419,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" @@ -5270,6 +5429,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" @@ -5303,7 +5462,5 @@ msgstr "Noch ohne Lösung" -#. --- 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 "Rolle:" @@ -5359,6 +5516,6 @@ "behalten oder entfernen wollen.
Der " "Standardwert ist behalten: der vereinigte Weg wird den " -"Platz der ursprünglichen Wege in den Relationsmitgliedschaften " -"einnehmen." +"Platz der ursprünglichen Wege in den Relationsmitgliedschaften einnehmen." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132 @@ -5374,6 +5531,6 @@ "behalten oder entfernen wollen.
Die " "Grundeinstellung ist behalten: der vereinigte Knoten nimmt " -"den Platz der ursprünglichen Knoten in den Relation-Mitgliedschaften " -"ein." +"den Platz der ursprünglichen Knoten in den Relation-Mitgliedschaften ein." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144 @@ -5412,5 +5569,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 @@ -5443,6 +5600,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." -msgstr "" -"Dialog-Fenster mit den gewählten Objekten aus der obigen Liste öffnen." +msgstr "Dialog-Fenster mit den gewählten Objekten aus der obigen Liste öffnen." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 @@ -5478,10 +5634,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 "" "Sie haben das Vereinen der Unterschiede in diesem Konflikt nicht " @@ -5562,18 +5717,18 @@ msgstr "Filtermodus" -#: ../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 "Versionsprotokoll" -#: ../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 "Versionsprotokoll aller gewählten Objekte anzeigen." -#: ../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 "Objekt mit Geschichte" -#: ../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 @@ -5583,13 +5738,13 @@ msgstr "Neu laden" -#: ../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 "Alle ausgewählten Objekte neu laden und die Liste aktualisieren." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303 msgid "Show" msgstr "Anzeigen" -#: ../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 "Geschichte der markierten Elemente anzeigen." @@ -5784,5 +5939,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 "" @@ -5827,25 +5982,25 @@ msgstr "Auf Auswahl zoomen" -#: ../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 "Ausw.: Rel.:{0}/Wege:{1}/Knoten:{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 "Auswahl" -#: ../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 "Auswahl: {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 "Ansicht separat darstellen" -#: ../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." @@ -5854,5 +6009,5 @@ "Werkzeugleiste." -#: ../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 "Klicken Sie zum Minimieren oder Maximieren der Ansicht" @@ -5918,38 +6073,37 @@ msgstr "# Objekte" -#: ../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 "" -"Die zugehörige Relation des ausgewählten Relationselements bearbeiten" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221 +msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220 msgid "Download all child relations (recursively)" msgstr "Alle Kind-Relationen herunterladen (rekusiv)" -#: ../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 "Alle Kind-Relationen herunterladen" -#: ../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 "Ausgewählte Verknüpfungen herunter laden" -#: ../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 "Ausgewählte Kind-Relationen herunterladen" -#: ../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 "Relationselemente herunterladen" -#: ../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 "Konflikte in den Daten" -#: ../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 "" @@ -5960,17 +6114,18 @@ "nicht geladen werden." -#: ../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 "Relation gelöscht" -#: ../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 "Relation {0} wird heruntergeladen" -#: ../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}" @@ -5978,22 +6133,49 @@ "Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +#: ../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] "Relation ''{0}'' herunterladen" +msgstr[1] "Relation ''{0}'' herunterladen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Relationselemente herunterladen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "Relation ''{0}'' herunterladen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 msgid "Tags and Members" msgstr "Merkmale und Elemente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Parent Relations" msgstr "Eltern-Relationen" -#: ../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 "Kind-Relationen" -#: ../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 "Rolle anwenden" + +#: ../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 "Eingeben einer Rolle für alle Relationselemente" + +#: ../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?" +"relation itself.
This creates circular dependencies and is discouraged." +"
How do you want to proceed with circular dependencies?" msgstr "" "Ein Element dieser Relation entspricht der Relation selbst.
Dadurch " @@ -6001,29 +6183,28 @@ "Sie die zirkuläre Abhängigkeit behandeln?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 msgid "Remove them, clean up relation" msgstr "Objekt entfernen und Verbindung lösen" -#: ../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 "Ignorieren und die aktuelle Verbindung belassen" -#: ../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 "" -"Das Objekt
{0}
ist bereits in der Relation " -"enthalten.

Wollen Sie es ein weiteres Mal in die Relation " -"aufnehmen?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 +"primitive ''{0}''

Do you really want to add another relation member?" +msgstr "" +"Das Objekt
{0}
ist bereits in der Relation enthalten." +"

Wollen Sie es ein weiteres Mal in die Relation aufnehmen?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 msgid "Multiple members referring to same primitive" msgstr "Mehrere Elemente verweisen auf das gleiche Objekt" -#: ../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 "" @@ -6036,5 +6217,5 @@ "Relation ''{0}''." -#: ../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" @@ -6043,5 +6224,5 @@ "hinzufügen" -#: ../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" @@ -6050,5 +6231,5 @@ "hinzufügen" -#: ../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 " @@ -6058,5 +6239,5 @@ "ausgewählten Element hinzufügen" -#: ../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 " @@ -6066,16 +6247,15 @@ "ausgewählten Element hinzufügen" -#: ../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 "" -"Alle Elemente mit Verweis zu einem der ausgewählten Objekte entfernen" +msgstr "Alle Elemente mit Verweis zu einem der ausgewählten Objekte entfernen" #. 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 "Relations-Editor: Ausgewählte entfernen" -#: ../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" @@ -6083,5 +6263,5 @@ "Wählen Sie Relationselemente aus, die in der aktuellen Auswahl vorkommen" -#: ../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 "" @@ -6092,53 +6272,57 @@ "Auswahl vorkommen" -#: ../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 "Objekte für gewählte Relationselemente auswählen" -#: ../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 "Relationselemente sortieren" -#. 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 "Sport" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 msgid "Relation Editor: Sort" msgstr "Relations-Editor: Sortieren" -#: ../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 "Ausgewählte Elemente nach oben schieben" #. 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 "Relations-Editor: Nach oben verschieben" -#: ../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 "Ausgewählte Elemente nach unten schieben" #. 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 "Relations-Editor: Nach unten verschieben" -#: ../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 "Das aktuell ausgewählte Element aus dieser Beziehung entfernen" #. 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 "Relations-Editor: Entfernen" -#: ../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 "Die aktuell bearbeitete Beziehung löschen" -#: ../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 "Konflikt erstellen und schließen" -#: ../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 "" @@ -6146,9 +6330,9 @@ "schließen" -#: ../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 "Bearbeitung fortsetzen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../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" @@ -6157,5 +6341,5 @@ "Relation wiederaufzunehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6164,59 +6348,65 @@ msgstr "" "Diese Relation wurde außerhalb des Editors verändert.
Es ist nicht " -"möglich, die Änderungen zu übernehmen und die Bearbeitung " -"fortzusetzen.

Soll ein Konflikt erstellt und der Editor geschlossen " -"werden?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 +"möglich, die Änderungen zu übernehmen und die Bearbeitung fortzusetzen." +"

Soll ein Konflikt erstellt und der Editor geschlossen werden?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 msgid "Conflict in data" msgstr "Datenkonflikt" -#: ../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." +#: ../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 "" "Ebene ''{0}'' enthält bereits einen Konflikt für das " "Element
''{1}''.
Bitte lösen Sie diesen Konflikt zunächst auf." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 msgid "Apply the current updates" msgstr "Aktualisierung übernehmen" -#: ../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 "Updates anwenden und den Dialog schliessen" -#: ../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 "Updates abbrechen und den Dialog schliessen" -#: ../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 "Einen leeren Schlüssel hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 -msgid "Download all incomplete ways and nodes in relation" -msgstr "Alle nicht vollständigen Wege und Knoten der Relation herunterladen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#, fuzzy +msgid "Download all incomplete members" +msgstr "Relationselemente herunterladen" + +#: ../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 "Elemente herunterladen" -#: ../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 "Relations-Editor: Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#, fuzzy +msgid "Download selected incomplete members" +msgstr "Relationselemente herunterladen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 msgid "Sets a role for the selected members" msgstr "Definiert eine Rolle für die ausgewählten Elemente" -#: ../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 "Rolle anwenden" -#: ../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 "" @@ -6226,42 +6416,34 @@ msgstr "" "Sie setzen eine leere Rolle für das Relationselement{0}.
Damit " -"löschen Sie die dessen Rolle.
Wollen Sie die leere Rolle wirklich " -"löschen?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +"löschen Sie die dessen Rolle.
Wollen Sie die leere Rolle wirklich löschen?" +"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 msgid "Yes, apply it" msgstr "Übernehmen" -#: ../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 "Nicht übernehmen" -#: ../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 "Leere Rolle bestätigen" -#: ../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 "" -"Die zugehörige Relation des ausgewählten Relationselements bearbeiten" - -#. download the relation -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 -#, java-format -msgid "Downloading relation ''{0}''" -msgstr "Relation ''{0}'' herunterladen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 +msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 msgid "Zoom to" msgstr "Zoomen auf" -#: ../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 "" "Auf das Objekt zoomen, auf welches das erste ausgewählte Element verweist" -#: ../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 "" @@ -6269,5 +6451,5 @@ "ist" -#: ../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 "Zoom ist deaktiviert, weil kein Element ausgewählt wurde" @@ -6308,19 +6490,19 @@ msgstr "Die ausgewählte Relation bearbeiten" -#: ../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 "Änderungen übernehmen" -#: ../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 "Erzeuge neue Relation in Ebene \"{0}\"" -#: ../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 "Ändere neue Relation in Ebene \"{0}\"" -#: ../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}''" @@ -6332,6 +6514,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 "" "Warnung: Ignoriere Fehlermedlung, da der zugrundeliegende Vorgang " @@ -6508,6 +6689,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374 msgid "Click to close the dialog and to abort downloading" -msgstr "" -"Klicken, um das Fenster zu schließen und das Herunterladen abzubrechen" +msgstr "Klicken, um das Fenster zu schließen und das Herunterladen abzubrechen" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 @@ -6522,11 +6702,10 @@ #, java-format msgid "" -"Neither {0} nor {1} is " -"enabled.
Please chose to either download OSM data, or GPX data, or " -"both." -msgstr "" -"Weder {0} noch {1} ist " -"ausgewählt.
Bitte wählen Sie, ob sie OSM-Datenobjekte, GPS-Spuren oder " -"beides laden wollen." +"Neither {0} nor {1} is enabled." +"
Please chose to either download OSM data, or GPX data, or both." +msgstr "" +"Weder {0} noch {1} ist ausgewählt." +"
Bitte wählen Sie, ob sie OSM-Datenobjekte, GPS-Spuren oder beides laden " +"wollen." #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80 @@ -7298,5 +7477,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 @@ -7539,15 +7718,15 @@ "english.

Please help to improve the JOSM help system and fill in the " "missing information.You can both edit the help topic in your " -"local language ({1}) and the help topic in " -"english.

" -msgstr "" -"

Hilfe-Seite für ein Hilfe-Thema " -"fehlt

Für das Hilfe-Thema {0} " -"ist noch keine Hilfe-Seite verfügbar. Sie fehlt sowohl in Ihrer lokalen " -"Sprache ({1}) als auch in Englisch.

Bitte helfen Sie, das JOSM-Hilfe-" -"System zu verbessern und tragen Sie die fehlenden Informationen nach. Sie " -"können sowohl die Hilfe-Seite in ihrer lokalen Sprache " -"({1}), als auch die Hilfe-Seite in Englisch " -"editieren.

" +"local language ({1}) and the help topic in english." +msgstr "" +"

Hilfe-Seite für ein Hilfe-Thema fehlt

Für das Hilfe-Thema {0} ist " +"noch keine Hilfe-Seite verfügbar. Sie fehlt sowohl in Ihrer lokalen Sprache " +"({1}) als auch in Englisch.

Bitte helfen Sie, das JOSM-Hilfe-System " +"zu verbessern und tragen Sie die fehlenden Informationen nach. Sie können " +"sowohl die Hilfe-Seite in ihrer lokalen Sprache ({1}), " +"als auch die Hilfe-Seite in Englisch editieren.

" #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 @@ -7556,11 +7735,11 @@ "

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 "" "

Fehler beim Lesen der Hilfe-Seite

Der Inhalt für das Hilfe-Thema {0} " -"konnte nicht geladen werden. Die Fehlermeldung " -"ist:
{1}

" +"konnte nicht geladen werden. Die Fehlermeldung ist:
{1}

" #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 @@ -7570,6 +7749,6 @@ "network problem, please check your
your internet connection" msgstr "" -"Die Hilfe-Seite unter der URL {0} konnte nicht geöffnet " -"werden.
Vermutlich ist Ihre Internet-Verbindung unterbrochen." +"Die Hilfe-Seite unter der URL {0} konnte nicht geöffnet werden." +"
Vermutlich ist Ihre Internet-Verbindung unterbrochen." #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 @@ -7839,13 +8018,13 @@ msgstr "anonym" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 msgid "Changeset info" msgstr "Informationen zum Änderungssatz" -#: ../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 "Externen Browser mit Informationen zum Änderungssatz öffnen" -#: ../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}" @@ -7899,6 +8078,6 @@ msgid "Please select the changesets you want to close" msgstr "" -"Bitte wählen Sie die Änderungssätze, die geschlossen werden " -"sollen" +"Bitte wählen Sie die Änderungssätze, die geschlossen werden sollen" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 @@ -7948,6 +8127,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 "" "Ebene \"{0}\" enthält Modifikationen, die zum Server hochgeladen werden " @@ -8042,10 +8220,10 @@ 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] "" -"{0} Ebene soll gespeichert werden, ist aber mit keiner Datei " -"verknüpft.
Wählen Sie eine Datei für diese Ebene oder verwerfen Sie die " -"Änderungen.
Ebene ohne verknüpfte Datei:" +"{0} Ebene soll gespeichert werden, ist aber mit keiner Datei verknüpft." +"
Wählen Sie eine Datei für diese Ebene oder verwerfen Sie die Änderungen." +"
Ebene ohne verknüpfte Datei:" msgstr[1] "" "{0} Ebenen sollen gespeichert werden, sind aber mit keiner Datei " @@ -8061,6 +8239,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 " @@ -8127,5 +8305,5 @@ msgstr "Ebene \"{0}\" für Hochladen vorbereiten..." -#: ../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 " @@ -8135,5 +8313,5 @@ "Daten
wurde abgebrochen oder ist fehlgeschlagen." -#: ../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 "Unvollständiges Hochladen und/oder Speichern" @@ -8206,13 +8384,13 @@ #: ../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 "Hochladen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 msgid "Settings" msgstr "Einstellungen" -#: ../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 "" @@ -8220,28 +8398,28 @@ "Änderungssatz verwendet wird" -#: ../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 "Merkmale des neuen Änderungssatzes" -#: ../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 "Merkmale im Änderungssatz nutzen, zu dem Hochgeladen wird" -#: ../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 "Neue Objekte:" -#: ../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 "Geänderte Objekte:" -#: ../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 "Zu löschende Objekte:" -#: ../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:" @@ -8250,5 +8428,5 @@ msgstr[1] "{0} hinzugefügte Objekte:" -#: ../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:" @@ -8257,5 +8435,5 @@ msgstr[1] "{0} zu bearbeitende Objekte:" -#: ../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:" @@ -8264,74 +8442,69 @@ msgstr[1] "{0} zu löschende Objekte:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 msgid "Upload Changes" msgstr "Änderungen hochladen" -#: ../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 "Geänderte Objekte hochladen" -#: ../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 "" -"Bitte gib einen Kommentar für den Änderungssatz ein. (mind. 3 Zeichen)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 +msgstr "Bitte gib einen Kommentar für den Änderungssatz ein. (mind. 3 Zeichen)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 msgid "Illegal upload comment" msgstr "Ungültiger Kommentar" -#: ../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 "Bitte eine gültige Nummer für die Endnummer eingeben" + +#: ../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 "Hochladen abbrechend und Bearbeitung fortsetzen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 -msgid "Upload all changes in one request" -msgstr "Alle Änderungen in einer Anfrage hochladen" - -#: ../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 "" -"Zum Hochladen aller Änderungen mit nur einer Anfrage aktivieren. " -"Deaktivieren zur Nutzung eine Anfrage je geändertem Objekt." - -#: ../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 "Ein kurzer Kommentar über die hochzuladenden Änderungen:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 msgid "Enter an upload comment (min. 3 characters)" msgstr "" "Bitte einen Kommentar für den Änderungssatz eingeben. (mind. 3 Zeichen)" -#: ../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 "Neuen Änderungssatz öffnen" -#: ../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 "" -"Einen neuen Änderungssatz öffnen und beim nächsten Hochladen verwenden" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 +msgstr "Einen neuen Änderungssatz öffnen und beim nächsten Hochladen verwenden" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 msgid "Use an open changeset" msgstr "Offenen Änderungssatz verwenden" -#: ../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 "Daten in einen vorhandenen, offenen Änderungssatz hochladen" -#: ../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 "Änderungssatz nach dem Hochladen schließen" -#: ../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 "" "Auswählen, um den Änderungssatz nach dem nächsten Hochladen zu schließen" -#: ../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}" @@ -8339,16 +8512,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 "Liste Ihrer offenen Änderungssätze vom Server laden" -#: ../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 "Ausgewählten offenen Änderungssatz schließen" -#: ../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}." @@ -8356,6 +8529,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 "" @@ -8366,5 +8539,5 @@ "dieses Objekt und fahre mit dem Hochladen fort." -#: ../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 "Objekte zum Hochladen vorbereiten..." @@ -8375,6 +8548,6 @@ "be uploaded to the server." msgstr "" -"Markiere die modifizierten Objekte aus der aktuellen " -"Auswahl, die zum Server hochgeladen werden sollen. " +"Markiere die modifizierten Objekte aus der aktuellen Auswahl, die zum Server hochgeladen werden sollen. " #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 @@ -8398,111 +8571,59 @@ msgstr "Mit Hochladen fortfahren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Bilder für {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "GPX lesen..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Keine Zeit für Punkt {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 "Zeit \"{0}\" vom Punkt {1} x {2} konnte nicht gelesen werden" - -#: ../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 "Einlesen {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden." - -#: ../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 "Georeferenzierte Bilder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "GPS Start: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "GPS Ende: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "Aktueller Unterschied: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "Zeitzonen Unterschied: " - -#: ../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] "Bild" -msgstr[1] "Bilder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} innerhalb der GPS-Spur." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Uhrzeit synchronisieren" - -#: ../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 "JPEG-Bilder (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "Das Datum in der Datei \"{0}\" konnte nicht verarbeitet werden." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "Keine EXIF-Zeitinformationen in der Datei \\\"{0}\\\" enthalten." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Bild" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Angezeigtes Datum eingeben (mm/tt/jjjj HH:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "Zeitzone des GPS-Geräts (Unterschied zum Foto)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Zeit mit GPS-Gerät synchronisieren" - -#: ../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 "Die eingegebene Zeit konnte nicht eingelesen werden." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, fuzzy, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "Achtung: Fehler beim speichern der Voreinstellungen in \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 +#, fuzzy +msgid "Upload data in one request" +msgstr "Alle Änderungen in einer Anfrage hochladen" + +#: ../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 +#, fuzzy +msgid "(1 request)" +msgstr "Fehlerhafte Anfrage" + +#: ../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} Meter" +msgstr[1] "{0} Meter" + +#: ../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 "Bitte einen Filterbegriff eingeben:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 +#, fuzzy, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" +"Datei \"{0}\" kann nicht geschrieben werden. Bitte wählen Sie einen anderen " +"Dateinamen." + +#: ../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 @@ -8510,30 +8631,30 @@ msgstr "GPS-Punkt" -#: ../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 "Linienaussehen anpassen" -#: ../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 "Globale Einstellungen verwenden." -#: ../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 "Linien zwischen Punkten dieser Ebene zeichnen." -#: ../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 "Keine Linien zwischen Punkten dieser Ebene zeichnen." -#: ../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 "Linienaussehen wählen" -#: ../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 @@ -8541,5 +8662,5 @@ msgstr "Farben anpassen" -#: ../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 @@ -8548,5 +8669,5 @@ msgstr "Voreinstellung" -#: ../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 @@ -8555,64 +8676,69 @@ msgstr "Farbe auswählen" -#: ../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 "Marken von benannten Punkten" -#: ../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 "Benannte GPS-Punkte von {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215 msgid "Import Audio" msgstr "Audio importieren" -#: ../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 "" -"Die Daten in der GPS-Ebene ''{0}'' wurden vom Server " -"heruntergeladen.
Da die Wegpunkte keine Zeitstempel enthalten, können sie " -"auch nicht mit Audiodaten verknüpft werden." - -#: ../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 "" +"Die Daten in der GPS-Ebene ''{0}'' wurden vom Server heruntergeladen." +"
Da die Wegpunkte keine Zeitstempel enthalten, können sie auch nicht mit " +"Audiodaten verknüpft werden." + +#: ../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 "Import nicht möglich" -#: ../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 "Audio-Dateien im Wave-Format (*.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 "Audio-Marken von {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 "Bilder importieren" -#: ../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 "" -"Die Daten in der GPS-Ebene ''{0}'' wurden vom Server " -"heruntergeladen.
Da die Wegpunkte keine Zeitstempel enthalten, können sie " -"auch nicht mit Bildern verknüpft werden." - -#: ../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 "" +"Die Daten in der GPS-Ebene ''{0}'' wurden vom Server heruntergeladen." +"
Da die Wegpunkte keine Zeitstempel enthalten, können sie auch nicht mit " +"Bildern verknüpft werden." + +#: ../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 "JPEG-Bilder (*.jpg)" + +#: ../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 "Name: {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 @@ -8620,5 +8746,5 @@ msgstr "Beschreibung: {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" @@ -8628,5 +8754,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 @@ -8634,22 +8760,17 @@ msgstr "Beschreibung" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 msgid "Timespan" msgstr "Zeitraum" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 msgid "Length" msgstr "Länge" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 -msgid "URL" -msgstr "URL" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443 msgid "Length: " msgstr "Länge: " -#: ../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, " @@ -8658,5 +8779,5 @@ msgstr[1] "{0} Routen, " -#: ../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" @@ -8665,25 +8786,24 @@ msgstr[1] "{0} Wegpunkte" -#: ../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 "Zur Daten-Ebene konvertieren" -#: ../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 "" -"Hochladen von unbearbeiteten GPS-Daten als Kartendaten ist " -"unerwünscht!
Weitere Informationen, falls Sie die GPX-Spur hochladen " -"möchten:" - -#: ../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 "" +"Hochladen von unbearbeiteten GPS-Daten als Kartendaten ist unerwünscht!" +"
Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:" + +#: ../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 @@ -8693,29 +8813,29 @@ msgstr "Konvertiert von: {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 "OSM-Daten entlang der GPS-Spur herunterladen" -#: ../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 "Alles im Bereich herunterladen:" -#: ../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} Meter" -#: ../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 "Maximalgebiet je Anfrage:" -#: ../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} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8726,5 +8846,5 @@ "fortfahren?" -#: ../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 "" @@ -8732,5 +8852,5 @@ "werden kann." -#: ../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 " @@ -8740,5 +8860,5 @@ "wurden ignoriert oder an den Anfang verschoben." -#: ../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 " @@ -8748,24 +8868,24 @@ "der GPS-Spur entfernt waren, wurden ignoriert." -#: ../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 "Datenebene {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 "Außerhalb des heruntergeladenen Bereichs" -#: ../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 "Version {0}" -#: ../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 "" "Warnung: Das Vermischen von 0.6- und 0.5-Daten resultiert in Version 0.5" -#: ../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." @@ -8774,5 +8894,5 @@ msgstr[1] "{0} Konflikte wurden entdeckt." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 #, java-format msgid "" @@ -8792,5 +8912,5 @@ "dem Server gelöscht wurden." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 #, java-format msgid "" @@ -8807,11 +8927,11 @@ "Dialog und lösen Sie sie manuell." -#: ../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 "Diesen Dialog schließen und Bearbeitung fortsetzen" -#: ../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" @@ -8820,32 +8940,32 @@ msgstr[1] "{0} gelöscht" -#: ../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} besteht aus:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 msgid "unset" msgstr "nicht angegeben" -#: ../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 "API-Version: {0}" -#: ../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 "Zu GPX-Ebene konvertieren" -#: ../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 "Datensatzkonsistenzprüfung" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 msgid "No problems found" msgstr "Keine Probleme gefunden" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 msgid "Following problems found:" msgstr "Folgende Probleme gefunden:" @@ -8853,9 +8973,9 @@ #: ../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:" -msgstr "" -"Das Hochladen unbearbeiteter GPS-Daten wird als schädlich " -"angesehen.
Informationen zum Hochladen von Tracks finden Sie hier:" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" +msgstr "" +"Das Hochladen unbearbeiteter GPS-Daten wird als schädlich angesehen." +"
Informationen zum Hochladen von Tracks finden Sie hier:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 @@ -8893,4 +9013,363 @@ msgstr[1] "{0} Punkte" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "GPX-Dateien (*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "Datei {0} ist unter dem Namen \"{1}\" bereits geladen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#, java-format +msgid "Error while parsing {0}" +msgstr "Fehler beim Einlesen von {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Kann \"{0}\" nicht lesen" + +#: ../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 "" +"Nehmen Sie ein Foto des GPS-Empfängers auf, während er die Zeit " +"anzeigt.
Dieses Foto hier anzeigen.
Erfassen Sie dann die Zeit auf " +"dem Foto und wählen eine Zeitzone
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Fotozeit (aus EXIF):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "GPS-Zeit (aus obigem Photo): " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [dd/mm/yyyy hh:mm:ss]" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +msgid "I'm in the timezone of: " +msgstr "Ich bin in der Zeitzone von: " + +#: ../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 "Kein Datum" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "Ein anderes Foto öffnen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +msgid "Synchronize time from a photo of the GPS receiver" +msgstr "Zeit von Foto und GPS-Empfänger synchronisieren" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"Fehler beim Lesen des Datums.\n" +"Bitte verwenden Sie das geforderte Format" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "Ungültiges Datum" + +#: ../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 "GPS-Spur: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Eine andere GPS-Spur laden" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +msgid "Timezone: " +msgstr "Zeitzone: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +msgid "Offset:" +msgstr "Offset:" + +#: ../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 "" +"Ich kann ein Bild meines GPS-Empfängers machen.
Ist das hilfreich?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 +msgid "Update position for: " +msgstr "Position aktualisieren für: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 +msgid "All images" +msgstr "Alle Bilder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 +msgid "Images with no exif position" +msgstr "Bilder ohne EXIF-Position" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 +msgid "Not yet tagged images" +msgstr "Noch nicht referenzierte Bilder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +msgid "Correlate images with GPX track" +msgstr "Bilder mit GPS-Spur korrelieren" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Correlate" +msgstr "Korrelieren" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Auto-Guess" +msgstr "Automatisch ermitteln" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +msgid "You should select a GPX track" +msgstr "Wählen Sie eine GPS-Spur" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "Keine GPS-Spur gewählt" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Fehler beim Lesen der Zeitzone.\n" +"Erwartetes Format: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +msgid "Invalid timezone" +msgstr "Ungültige Zeitzone" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Fehler beim Einlesen des Offsets.\n" +"Erwartetes Format: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +msgid "Invalid offset" +msgstr "Ungültiger Offset" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "{0} Treffer für {1} in GPS-Spur {2} gefunden" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "GPS-Spur geladen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 +msgid "The selected photos don't contain time information." +msgstr "Die gewählten Bilder enthalten keine Zeitinformation." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 +msgid "Photos don't contain time information" +msgstr "Bilder enthalten keine Zeitinformation" + +#: ../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 "" +"Die gewählte GPS-Spur enthält keine Zeitstempel. Bitte wählen Sie eine " +"andere." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "GPS-Spur enthält keine Zeitinformationen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "Zeitzone: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "Minuten: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "Sekunden: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "{0} von {1} Bildern mit GPS-Spur synchronisiert." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "(Zeitdifferenz von {0} Tagen)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "Offset zwischen GPS-Spur und Bildern: {0}m {1}s" + +#: ../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 "" +"Beim Synchronisieren der Bilder mit der GPS-Spur ist ein Fehler aufgetreten. " +"Sie können die Schieberegler manuell einstellen, um die Bilder zu " +"synchonisieren." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 +msgid "Matching photos to track failed" +msgstr "Synchonisieren von Bildern und GPS-Spur fehlgeschlagen." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +msgid "Adjust timezone and offset" +msgstr "Zeitzone und Offset anpassen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +msgid "Default Values" +msgstr "Standardwerte" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +msgid "Extracting GPS locations from EXIF" +msgstr "GPS-Positionen aus EXIF-Daten extrahieren" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +msgid "Starting directory scan" +msgstr "Verzeichnisuntersuchen starten" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +msgid "One of the selected files was null" +msgstr "Eine der ausgewählten Dateien war nicht vorhanden." + +#: ../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 "Photos lesen..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "Einlesen {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 "Kann generischen Pfad für Verzeichnis{0} nicht bestimmen\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "Verzeichnis {0} untersuchen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "Leere Datei im Verzeichnis {0} gefunden\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Fehler beim Lesen der Dateien im Verzeichnis {0}\n" + +#: ../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 "Georeferenzierte Bilder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "Mit GPX korrelieren" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "Bild" +msgstr[1] "Bilder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "{0} wurden als GPS-markiert erkannt." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +msgid "No image" +msgstr "Kein Bild" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "{0} herunterladen" + +#: ../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 "Fehler bei Datei {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Georeferenzierte Bilder anzeigen" + +#: ../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 "Vorheriges" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Photo aus Ebene entfernen" + +#: ../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 "Nächstes" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "Anzeige zentrieren" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +msgid "Zoom best fit and 1:1" +msgstr "Passend zoomen und 1:1" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#, java-format +msgid "" +"\n" +"Altitude: {0} m" +msgstr "" +"\n" +"Höhe: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -9216,5 +9695,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 @@ -9413,6 +9892,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 "" "Richtungspfeile mittels Tabellenzugriffen anstatt komplexer Mathematik " @@ -9480,6 +9958,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 "" "Anti-Aliasing in der Kartenanzeige nutzen, um ein gefälligeres Aussehen zu " @@ -9551,19 +10028,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 "Verhalten und Aussehen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Sprache" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113 +msgid "Looking up available translations..." +msgstr "Verfügbare Übersetzungen suchen..." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196 msgid "Default (Auto determined)" msgstr "Standard (Automatisch)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Sprache" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:112 -msgid "Looking up available translations..." -msgstr "Verfügbare Übersetzungen suchen..." #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35 @@ -9665,6 +10142,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108 msgid "You have to restart JOSM for some settings to take effect." -msgstr "" -"Einige Einstellungen werden erst nach einem Neustart von JOSM wirksam." +msgstr "Einige Einstellungen werden erst nach einem Neustart von JOSM wirksam." #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 @@ -9798,6 +10274,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" -msgstr "" -"Ausgewählte verfügbare Stile zu der Liste der aktiven Stile hinzufügen" +msgstr "Ausgewählte verfügbare Stile zu der Liste der aktiven Stile hinzufügen" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -9826,9 +10301,9 @@ #, java-format msgid "" -"Failed to load the list of style sources " -"from
''{0}''.

Details (untranslated):
{1}" -msgstr "" -"Laden der verfügbaren Stile von ''{0}'' ist " -"fehlgeschlagen.

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

Details (untranslated):
{1}" +msgstr "" +"Laden der verfügbaren Stile von ''{0}'' ist fehlgeschlagen." +"

Details:
{1}" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 @@ -9894,6 +10369,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 "" "

Weiterhin werden die Tastaturkürzel aktiviert, wenn die Aktion das erste " @@ -9911,9 +10386,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 "" "

Sie werden feststellen, dass die Tastenauswahl auf der nächsten Seite " @@ -9922,9 +10396,9 @@ "sind. Falls Ihre Tastatur keine 'Copy'-Taste hat (PC-Tastaturen haben diese " "nicht, aber Sun-Tastaturen), verwenden Sie sie nicht. Außerdem gibt es " -"'Tasten', welche auf der Tastatur Abkürzungen entsprechen (z.B. " -"':'/Doppelpunkt). Bitte verwenden Sie diese nicht, sondern die Basistaste " -"('.'/Punkt auf der deutschen Tastatur, ...). Falls Sie dies nicht tun, kann " -"es Konflikte geben, da JOSM nicht erkennt, dass Strg+Umschalt+. und Strg+: " -"das gleiche ist...

" +"'Tasten', welche auf der Tastatur Abkürzungen entsprechen (z.B. ':'/" +"Doppelpunkt). Bitte verwenden Sie diese nicht, sondern die Basistaste ('.'/" +"Punkt auf der deutschen Tastatur, ...). Falls Sie dies nicht tun, kann es " +"Konflikte geben, da JOSM nicht erkennt, dass Strg+Umschalt+. und Strg+: das " +"gleiche ist...

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177 @@ -9952,6 +10426,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 "" "

Das Pseudo-Tastaturkürzel 'disabled' deaktiviert Tastaturkürzel.

" @@ -10045,5 +10519,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 "Mehr Informationen zu dieser Vorlage" @@ -10130,12 +10604,11 @@ msgstr "Punkte {0} bis {1} werden heruntergeladen..." -#: ../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 msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" -"Die Zeichenkette ''{0}'' konnte nicht in ein Datum umgewandelt werden." - -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +msgstr "Die Zeichenkette ''{0}'' konnte nicht in ein Datum umgewandelt werden." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -10259,16 +10732,15 @@ msgstr "Unbekannter Modus {0}." -#: ../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." +#: ../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 "" "Im lokalem Datensatz ist kein Objekt mit der ID {0} vorhanden. Typ ist daher " "unklar." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../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 @@ -10296,24 +10768,31 @@ msgstr "ID \"{0}\" ausgelassen wegen Serverantwort Nummer 404" -#: ../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 "Mehrere Knoten von \"{0}\" abrufen" -#: ../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 "Mehrere Wege von \"{0}\" abrufen" -#: ../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 "Mehrere Relationen von \"{0}\" abrufen" -#: ../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 "Serverantwort Nummer 404, versuche Einzelanfragen für jedes Element" + +#: ../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] "Relation ''{0}'' herunterladen" +msgstr[1] "Relation ''{0}'' herunterladen" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10355,29 +10834,29 @@ msgstr "Einstellung {0} fehlt. Kann OsmApi nicht initialisieren." -#: ../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 "Diese JOSM-Version ist mit dem eingestellten Server inkompatibel." -#: ../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}." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#, fuzzy, java-format +msgid "" +"It supports protocol version 0.6, while the server says it supports {0} to " +"{1}." msgstr "" "JOSM unterstützt die Protokoll-Versionen 0.5 und 0.6, während der Server {0} " "bis {1} unterstützt." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Kommunikation mit {0} mittels Protokollversion {1} etabliert." -#: ../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 "Unerwartetes Format der ID vom Server erhalten. Wert ist \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 #, java-format msgid "" @@ -10387,62 +10866,62 @@ "\"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 msgid "Creating changeset..." msgstr "Änderungssatz erstellen..." -#: ../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 "Änderungssatz {0} erfolgreich geöffnet" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 msgid "Updating changeset..." msgstr "Änderungssatz aktualisieren..." -#: ../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 "Änderungssatz {0} aktualisieren..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 msgid "Closing changeset..." msgstr "Änderungssatz schließen..." -#: ../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 "Kein Änderungssatz zum Hochladen vorhanden" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "Preparing..." msgstr "Daten vorbereiten..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Daten hochladen..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Waiting 10 seconds ... " msgstr "Warte 10 Sekunden... " -#: ../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 "Starte Versuch {0} von {1} in {2} Sekunden..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 msgid "OK - trying again." msgstr "OK - erneuter Versuch." -#: ../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 "Starte Wiederholung {0} von {1}." -#: ../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 "" "Aktueller Änderungssatz ist leer. Daten konnten nicht hochgeladen werden." -#: ../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}." @@ -10451,5 +10930,5 @@ "ist {0}." -#: ../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}." @@ -10486,5 +10965,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}''." @@ -10514,5 +10993,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}." @@ -10521,5 +11000,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}" @@ -10532,5 +11011,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}''." @@ -10590,7 +11069,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 "" "WARNUNG: Das Passwort wird im Klartext in der Einstellungsdatei " @@ -10617,21 +11096,20 @@ msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -"Beim Speichern ist ein Fehler aufgetreten.
Der Fehler lautet: " -"
{0}" +"Beim Speichern ist ein Fehler aufgetreten.
Der Fehler lautet:
" +"{0}" #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" -"An error occurred while restoring backup file.
Error " -"is:
{0}" -msgstr "" -"Beim Wiederherstellen der Sicherheitskopie ist ein Fehler " -"aufgetreten.
Der Fehler lautet:
{0}" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" +"Beim Wiederherstellen der Sicherheitskopie ist ein Fehler aufgetreten." +"
Der Fehler lautet:
{0}" #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 #, java-format msgid "Could not back up file. Exception is: {0}" -msgstr "" -"Sicherung der Datei konnte nicht erstellt werden. Der Fehler ist: {0}" +msgstr "Sicherung der Datei konnte nicht erstellt werden. Der Fehler ist: {0}" #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17 @@ -10701,28 +11179,28 @@ msgstr "Die Datei \"{0}\" existiert nicht" -#: ../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}''." +#: ../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 "" "Notwendiges Attribut des XML-Elements ''bounds'' fehlt. Erhielt " "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Found XML element not as direct child of element ." msgstr "Das XML-Element ist kein unmittelbares Kindelement von ." -#: ../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 "Fehlendes obligatorisches Attribut \"{0}\" auf des Wegs {1}" -#: ../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 "Ungültiger Wert \"{0}\" des Attributs \"ref\" im Element ." -#: ../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 "" @@ -10730,22 +11208,21 @@ "gefunden" -#: ../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 "Fehlendes Attribut \"ref\" bei Mitglied der Relation {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 -#, java-format -msgid "" -"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" +#: ../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 "" "Ungültiger Wert \"{1}\" für Attribut \"ref\" bei Element der Relation {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Fehlendes Attributs \"type\" bei Mitglied {0} der Relation {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 #, java-format msgid "" @@ -10755,9 +11232,9 @@ "{1}." -#: ../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 "Unvollständige -Beschreibung mit ref=0" -#: ../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." @@ -10766,10 +11243,10 @@ "Dieses wird ignoriert." -#: ../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 "Illegales Objekt mit 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 "" @@ -10781,8 +11258,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 "" @@ -10795,25 +11272,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 "Unbekannte oder nicht unterstützte API-Version. Erhaltener Wert: {0}" -#: ../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 "Das Attribut ''version'' für das OSM Element mit der ID {0} fehlt" -#: ../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 "Fehlendes erforderliches Attribut \"{0}\"." -#: ../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 "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 #, java-format msgid "" @@ -10823,5 +11300,5 @@ "mit externer ID ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10832,5 +11309,5 @@ "einer seiner {1} Knoten in den geladenen Daten fehlt." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10840,5 +11317,5 @@ "externer ID ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10849,13 +11326,13 @@ "externer ID ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:554 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 msgid "Prepare OSM data..." msgstr "OSM-Daten werden vorbereitet...." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 msgid "Parsing OSM data..." msgstr "OSM-Daten einlesen..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 msgid "Preparing data set..." msgstr "Datensatz wird vorbereitet ..." @@ -10910,4 +11387,10 @@ msgstr "Serververbindung..." +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 +#, fuzzy, java-format +msgid "Expected value > 0 for parameter ''{0}'', got {1}" +msgstr "Parameter \"index\" hat unerwarteten Wert {0}." + #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 #, java-format @@ -10917,6 +11400,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 msgid "Error: failed to add authentication credentials to the connection." -msgstr "" -"Fehler: Anmeldedaten konnten nicht zur Verbindung hinzugefügt werden." +msgstr "Fehler: Anmeldedaten konnten nicht zur Verbindung hinzugefügt werden." #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 @@ -10948,48 +11430,45 @@ "Ungültiger Wert \"{2}\" für das Attribut ''{0}'' des XML-Elements ''{1}''." -#: ../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 "Hochladen mit einer Anfrage pro Objekt beginnen..." -#: ../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 "{0}% ({1}/{2}), {3} verbleiben. Knoten ''{4}'' (id: {5}) hochladen" -#: ../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 "{0}% ({1}/{2}), {3} verbleiben. Weg ''{4}'' (id: {5}) hochladen" -#: ../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 "{0}% ({1}/{2}), {3} verbleiben. Relation ''{4}'' (id: {5}) hochladen" -#: ../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 "Übertragung in einer Anfrage wird gestartet ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#, fuzzy, java-format +msgid "Value >0 expected for parameter ''{0}'', got {1}" +msgstr "Parameter \"index\" hat unerwarteten Wert {0}." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 +#, fuzzy +msgid "Starting to upload in chunks..." +msgstr "Übertragung in einer Anfrage wird gestartet ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#, fuzzy, java-format +msgid "({0}/{1}) Uploading {2} objects..." +msgstr "Übertrage {0} Objekte zum Server ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "Übertragung zum Server ..." - -#: ../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 "" -"Achtung: Für die Übertragung ist keine API-Version definiert. Es wird daher " -"Version 0.6 benutzt." - -#: ../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 "" -"Achtung: Voreinstellung \"{0}\" oder API-Version \"{1}\" des Datensatzes " -"benötigen eine Übertragung der Änderungen. Dies wird ignoriert, da die " -"Server-API es nicht versteht." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11030,17 +11509,27 @@ msgstr "Plugin {0} herunterladen..." -#: ../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 "Plugin {0} herunterladen..." + +#: ../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 "Herunterladen überspringen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Download Plugin" msgstr "Plugin herunterladen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Skip Download" msgstr "Herunterladen überspringen" -#: ../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}." @@ -11052,18 +11541,15 @@ msgstr "Ein Fehler ist in dem Plugin {0} aufgetreten." -#: ../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 "" -"Start des Plugins {0} wurde veranlasst. Dieses Plugin wird nicht mehr " -"benötigt." - -#: ../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?" +"developed and very likely will produce errors.
It should be disabled." +"
Delete from preferences?" msgstr "" "Laden des Plugins {0} wurde angefordert.
Das Plugin wird nicht mehr " @@ -11071,5 +11557,5 @@ "deaktivieren Sie es.
Soll es aus den Einstellungen entfernt werden?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 msgid "" "You updated your JOSM software.\n" @@ -11081,34 +11567,34 @@ "Sollen die Plugins jetzt erneuert werden?" -#: ../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 "Letzte Aktualisierung der Plugins vor mehr als {0} Tagen." -#: ../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 "Plugins aktualisieren" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 msgid "Skip update" msgstr "Aktualisierung überspringen" -#: ../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 "Das Plugin {0} benötigt eine JOSM-Aktualisierung auf Version {1}." -#: ../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 "Das Plugin {0} wird vom Plugin {1} benötigt aber nicht gefunden." -#: ../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 "Plugin nicht gefunden: {0}." -#: ../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?" @@ -11116,16 +11602,16 @@ "Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?" -#: ../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 "Plugin abschalten" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Keep plugin" msgstr "Plugin behalten" -#: ../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 " @@ -11135,9 +11621,9 @@ "die Rechte besitzt die vorhandenen Plugins zu überschreiben." -#: ../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 "" @@ -11147,10 +11633,10 @@ "ausgelöst haben könnte." -#: ../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 "Laut den Informationen des Plugins ist der Autor des Plugins {0}." -#: ../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." @@ -11159,9 +11645,9 @@ "Plugins, bevor Sie den Fehler melden." -#: ../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 "Soll das Plugin abgeschaltet werden?" -#: ../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 " @@ -11171,5 +11657,5 @@ "um das Plugin zu entfernen." -#: ../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 "" @@ -11177,9 +11663,9 @@ "deaktiviert." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:386 msgid "Plugin information" msgstr "Plugin-Information" -#: ../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" @@ -11297,6 +11783,6 @@ msgstr "" "Sie sollten auch die Plugins aktualisieren. Falls das alles nicht " -"hilft, erstellen
Sie bitte mit folgendem Link einen " -"Fehlerbericht:

" +"hilft, erstellen
Sie bitte mit folgendem Link einen Fehlerbericht:

" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:99 @@ -11304,6 +11790,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 "" "

Die unten angezeigten Fehlerdaten sollten bereits vorausgefüllt " @@ -11333,6 +11819,6 @@ "the server URL in your preferences and your internet connection." msgstr "" -"Initialisierung der Verbindung mit dem OSM-Server {0} " -"fehlgeschlagen.
Prüfen Sie die Server-URL in den Einstellungen und Ihre " +"Initialisierung der Verbindung mit dem OSM-Server {0} fehlgeschlagen." +"
Prüfen Sie die Server-URL in den Einstellungen und Ihre " "Internetverbindung." @@ -11353,10 +11839,10 @@ 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 "" "Hochladen auf den Server ist fehlgeschlagen, da der " -"Datensatz
eine Vorbedingung nicht erfüllt.
Die Fehlermeldung " -"ist:
{0}" +"Datensatz
eine Vorbedingung nicht erfüllt.
Die Fehlermeldung ist:
" +"{0}" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 @@ -11366,6 +11852,6 @@ "already been closed." msgstr "" -"Schließen des Änderungssatzes {0} ist " -"fehlgeschlagen,
weil der Änderungssatz bereits geschlossen wurde." +"Schließen des Änderungssatzes {0} ist fehlgeschlagen," +"
weil der Änderungssatz bereits geschlossen wurde." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 @@ -11375,7 +11861,6 @@ "already been closed on {1}." msgstr "" -"Schließen des Änderungssatzes {0} ist " -"fehlgeschlagen,
weil der Änderungssatz bereits am {1} geschlossen " -"wurde." +"Schließen des Änderungssatzes {0} ist fehlgeschlagen," +"
weil der Änderungssatz bereits am {1} geschlossen wurde." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 @@ -11408,7 +11893,7 @@ "applet and because you didn''t load your applet from ''{1}''." msgstr "" -"Der Sicherheitskontext erlaubt keine Verbindung zum " -"Server
''{0}''.
Wahrscheinlich haben Sie JOSM als applet gestartet, " -"und dieses Applet
nicht von ''{1}'' geladen." +"Der Sicherheitskontext erlaubt keine Verbindung zum Server
''{0}''." +"
Wahrscheinlich haben Sie JOSM als applet gestartet, und dieses " +"Applet
nicht von ''{1}'' geladen." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 @@ -11433,11 +11918,10 @@ #, java-format msgid "" -"The OSM server
''{0}''
reported an internal server " -"error.
This is most likely a temporary problem. Please try again " -"later." -msgstr "" -"Der OSM-Server
''{0}''
hat einen internen Serverfehler " -"gemeldet.
Meist ist dies ein vorübergehendes Problem. Bitte versuchen Sie " -"es später erneut." +"The OSM server
''{0}''
reported an internal server error." +"
This is most likely a temporary problem. Please try again later." +msgstr "" +"Der OSM-Server
''{0}''
hat einen internen Serverfehler gemeldet." +"
Meist ist dies ein vorübergehendes Problem. Bitte versuchen Sie es " +"später erneut." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 @@ -11448,10 +11932,10 @@ #: ../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." -msgstr "" -"Der angeforderte Bereich ist zu groß oder enthält zu viele " -"Daten.
Versuche einen kleineren Bereich herunterzuladen oder nutze ein " +"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 "" +"Der angeforderte Bereich ist zu groß oder enthält zu viele Daten." +"
Versuche einen kleineren Bereich herunterzuladen oder nutze ein " "Datenbankexport." @@ -11483,6 +11967,6 @@ "Öffnen einer Verbindung zum entfernten Server
''{0}'' " "fehlgeschlagen.
Hostname \"{1}\" konnte nicht aufgelöst werden.
Bitte " -"prüfen Sie die API-URL in den Einstellungen und die " -"Internetverbindung." +"prüfen Sie die API-URL in den Einstellungen und die Internetverbindung." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 @@ -11491,12 +11975,12 @@ "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 "" "Der Server meldet, dass das Objekt gelöscht wurde.
Das " "Hochladen ist fehlgeschlagen, falls versucht wurde das Objekt zu " "aktualisieren oder zu löschen.
Das Herunterladen ist " -"fehlgeschlagen, falls versucht wurde, das Objekt " -"herunterzuladen.

Die Fehlermeldung lautet:
{0}" +"fehlgeschlagen, falls versucht wurde, das Objekt herunterzuladen." +"

Die Fehlermeldung lautet:
{0}" #: ../core/src/org/openstreetmap/josm/tools/I18n.java:98 @@ -11580,6 +12064,5 @@ #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 msgid "(Hint: You can edit the shortcuts in the preferences.)" -msgstr "" -"(Hinweis: Sie können die Tastaturkürzel in den Einstellungen ändern.)" +msgstr "(Hinweis: Sie können die Tastaturkürzel in den Einstellungen ändern.)" #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:56 @@ -11783,5 +12266,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" @@ -11796,12 +12279,10 @@ msgstr "Adressinterpolation festlegen" -#. 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 "ungerade" -#: ../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 @@ -11809,59 +12290,94 @@ msgstr "gerade" -#: ../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 "Alphabetisch" -#: ../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 "Nummer" + +#. 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 "Natur" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "Örtlichkeit" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Vermietung" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 #, java-format msgid "Relation: {0}" msgstr "Relation: {0}" -#: ../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 "Mit Straße verknüpfen per:" -#: ../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 "Nummerierungsschema:" -#: ../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 "Inneres Segment" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 msgid "Starting #:" msgstr "Startnummer:" -#: ../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 "Endnummer:" -#: ../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 "{0} zusätzliche Hausnummern-Knoten werden verküpft" -#: ../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 "Stadt:" -#: ../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 "Bundesland/-staat:" -#: ../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 "Postleitzahl:" -#: ../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 "Land:" -#: ../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 "Vollständige Adresse:" -#: ../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 "Optionale Adressinformationen:" -#: ../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 "" @@ -11869,5 +12385,5 @@ "verknüpft werden soll" -#: ../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 "" @@ -11875,400 +12391,48 @@ "verknüpft werden soll" -#: ../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 "Ungerade Hausnummern erwartet" -#: ../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 "Gerade Hausnummern erwartet" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093 +#, fuzzy +msgid "Expected valid number for address increment" +msgstr "Ungerade Hausnummern erwartet" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 msgid "Country code must be 2 letters" msgstr "Ländercode muss aus 2 Buchstaben bestehen" -#: ../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 "Bitte eine gültige Nummer für die Start und Ende eingeben" -#: ../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 "Alphabetische Adressen müssen mit einem Buchstaben aufhören" -#: ../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 "" -"Start- und Endnummer müssen für alphabetische Adressen identisch sein" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930 +msgstr "Start- und Endnummer müssen für alphabetische Adressen identisch sein" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1317 msgid "Starting address letter must be less than ending address letter" msgstr "Der Startbuchstabe muss im Alphabet vor dem Endbuchstaben liegen." -#: ../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 "Bitte eine gültige Nummer für die Startnummer eingeben" -#: ../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 "Bitte eine gültige Nummer für die Endnummer eingeben" -#: ../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 "Die Startnummer muss kleiner als die Endnummer sein." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "AgPifoJ - Geotagged pictures" -msgstr "AgPifoJ - Georeferenzierte Bilder" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "Georeferenzierte Bilder anzeigen" - -#: ../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 "Vorheriges" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Photo aus Ebene entfernen" - -#: ../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 "Nächstes" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "Anzeige zentrieren" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102 -msgid "Zoom best fit and 1:1" -msgstr "Passend zoomen und 1:1" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 -#, java-format -msgid "" -"\n" -"Altitude: {0} m" -msgstr "" -"\n" -"Höhe: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/h" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "GPS-Positionen aus EXIF-Daten extrahieren" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121 -msgid "Starting directory scan" -msgstr "Verzeichnisuntersuchen starten" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:126 -msgid "One of the selected files was null" -msgstr "Eine der ausgewählten Dateien war nicht vorhanden." - -#: ../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 "Photos lesen..." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:186 -#, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "Kann generischen Pfad für Verzeichnis{0} nicht bestimmen\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "Verzeichnis {0} untersuchen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "Leere Datei im Verzeichnis {0} gefunden\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Fehler beim Lesen der Dateien im Verzeichnis {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "Mit GPX korrelieren" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} wurden als GPS-markiert erkannt." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "Bilder mit AgPifoJ öffnen..." - -#: ../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 "Einen Satz Bilder als neue Ebene laden." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "GPX-Dateien (*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "Datei {0} ist unter dem Namen \"{1}\" bereits geladen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#, java-format -msgid "Error while parsing {0}" -msgstr "Fehler beim Einlesen von {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Kann \"{0}\" nicht lesen" - -#: ../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 "" -"Nehmen Sie ein Foto des GPS-Empfängers auf, während er die Zeit " -"anzeigt.
Dieses Foto hier anzeigen.
Erfassen Sie dann die Zeit auf " -"dem Foto und wählen eine Zeitzone
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Fotozeit (aus EXIF):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "GPS-Zeit (aus obigem Photo): " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [dd/mm/yyyy hh:mm:ss]" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 -msgid "I'm in the timezone of: " -msgstr "Ich bin in der Zeitzone von: " - -#: ../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 "Kein Datum" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "Ein anderes Foto öffnen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 -msgid "Synchronize time from a photo of the GPS receiver" -msgstr "Zeit von Foto und GPS-Empfänger synchronisieren" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"Fehler beim Lesen des Datums.\n" -"Bitte verwenden Sie das geforderte Format" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "Ungültiges Datum" - -#: ../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 "GPS-Spur: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Eine andere GPS-Spur laden" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -msgid "Timezone: " -msgstr "Zeitzone: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 -msgid "Offset:" -msgstr "Offset:" - -#: ../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 "" -"Ich kann ein Bild meines GPS-Empfängers machen.
Ist das " -"hilfreich?" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Position aktualisieren für: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Alle Bilder" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Bilder ohne EXIF-Position" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Noch nicht referenzierte Bilder" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 -msgid "Correlate images with GPX track" -msgstr "Bilder mit GPS-Spur korrelieren" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Correlate" -msgstr "Korrelieren" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Automatisch ermitteln" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "Wählen Sie eine GPS-Spur" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Keine GPS-Spur gewählt" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Fehler beim Lesen der Zeitzone.\n" -"Erwartetes Format: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Ungültige Zeitzone" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Fehler beim Einlesen des Offsets.\n" -"Erwartetes Format: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Ungültiger Offset" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "{0} Treffer für {1} in GPS-Spur {2} gefunden" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPS-Spur geladen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "Die gewählten Bilder enthalten keine Zeitinformation." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Bilder enthalten keine Zeitinformation" - -#: ../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 "" -"Die gewählte GPS-Spur enthält keine Zeitstempel. Bitte wählen Sie eine " -"andere." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPS-Spur enthält keine Zeitinformationen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Zeitzone: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minuten: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Sekunden: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "{0} von {1} Bildern mit GPS-Spur synchronisiert." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Zeitdifferenz von {0} Tagen)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Offset zwischen GPS-Spur und Bildern: {0}m {1}s" - -#: ../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 "" -"Beim Synchronisieren der Bilder mit der GPS-Spur ist ein Fehler aufgetreten. " -"Sie können die Schieberegler manuell einstellen, um die Bilder zu " -"synchonisieren." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "Synchonisieren von Bildern und GPS-Spur fehlgeschlagen." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Zeitzone und Offset anpassen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Standardwerte" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433 -msgid "No image" -msgstr "Kein Bild" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "{0} herunterladen" - -#: ../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 "Fehler bei Datei {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -12425,19 +12589,17 @@ #: ../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." -msgstr "" -"Eine spezielle Schnittstelle für das französische Kataster-WMS auf " -"www.cadastre.gouv.fr

Bitte lesen Sie die Nutzungsbedingungen (auf " -"Französisch):
http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html
bevor Sie Daten, die mit Hilfe dieses Plugins erstellt wurden, " -"hochladen." +"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 "" +"Eine spezielle Schnittstelle für das französische Kataster-WMS auf www." +"cadastre.gouv.fr

Bitte lesen Sie die Nutzungsbedingungen (auf " +"Französisch):
http://www.cadastre.gouv.fr/scpc/html/" +"CU_01_ConditionsGenerales_fr.html
bevor Sie Daten, die mit Hilfe " +"dieses Plugins erstellt wurden, hochladen." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 @@ -12774,12 +12936,4 @@ msgstr "Im PNG-Format exportieren (nur Pixelgrafiken)" -#: ../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] "Weg vereinfachen ({0} Knoten entfernen)" -msgstr[1] "Weg vereinfachen ({0} Knoten entfernen)" - #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 @@ -12900,14 +13054,14 @@ msgstr "Farbschemata" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 +#: ../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 "Fläche aufspalten" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 msgid "Splits an area by an untagged way." msgstr "Gebiet mittels eines Wegs ohne Merkmale aufteilen" -#: ../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 " @@ -13120,6 +13274,6 @@ msgstr "" "Kann die rxtxSerial-Bibliothek nicht laden. Falls Sie Hilfe bei der " -"Installation brauchen, versuchen Sie die GlobalSat-Internetseite " -"http://www.raphael-mack.de/josm-globalsat-gpx-import-plugin/" +"Installation brauchen, versuchen Sie die GlobalSat-Internetseite http://www." +"raphael-mack.de/josm-globalsat-gpx-import-plugin/" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 @@ -13221,4 +13375,8 @@ msgstr "Bilder mit ImageWayPoint öffnen" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Einen Satz Bilder als neue Ebene laden." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -13262,18 +13420,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 "Knotenpunktreduktion durchführen..." -#: ../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 "Douglas-Peucker-Näherung durchführen..." -#: ../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 "Doppelte Knoten entfernen..." -#: ../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" @@ -13322,7 +13480,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -13332,5 +13490,5 @@ #. 50000 #. -#. +#. #. #. @@ -13340,5 +13498,5 @@ #. 50000 #. -#. +#. #. #. @@ -13347,5 +13505,5 @@ #. 50000 #. -#. +#. #. #. @@ -13355,5 +13513,5 @@ #. 50000 #. -#. +#. #. #. @@ -13431,6 +13589,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 "" "Maximale Anzahl von Abschnitten in jedem generierten Weg. Standard ist 250." @@ -13454,11 +13611,10 @@ #: ../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 " +"Accuracy of Douglas-Peucker line simplification, measured in degrees." +"
Lower values give more nodes, and more accurate lines. Default 0.0003." +msgstr "" +"Genauigkeit der Douglas-Peucker Linien-Vereinfachung, gemessen in Grad." +"
Kleinere Werte ergeben genauere Linien, aber mehr Knoten. Standard ist " "0.0003." -msgstr "" -"Genauigkeit der Douglas-Peucker Linien-Vereinfachung, gemessen in " -"Grad.
Kleinere Werte ergeben genauere Linien, aber mehr Knoten. Standard " -"ist 0.0003." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 @@ -13497,6 +13653,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80 msgid "Maximum size of each cache directory in bytes. Default is 300MB" -msgstr "" -"Maximale Größe des Speicherverzeichnisses in Bytes. Standard ist 300MB" +msgstr "Maximale Größe des Speicherverzeichnisses in Bytes. Standard ist 300MB" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81 @@ -13525,20 +13680,19 @@ msgstr "Kann Bild nicht laden" -#: ../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 "Verbinden" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Verbunden" -#. 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 "Nicht verbunden" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "Verbindung fehlgeschlagen" @@ -13604,6 +13758,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 msgid "Continuously center the LiveGPS layer to current position." -msgstr "" -"Die LiveGPS-Ebene kontinuierlich auf die aktuelle Position zentrieren." +msgstr "Die LiveGPS-Ebene kontinuierlich auf die aktuelle Position zentrieren." #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101 @@ -13741,8 +13894,7 @@ "new server? (Strongly recommended)" msgstr "" -"Das openstreetbugs-Plugin verwendet den alten Server auf " -"appspot.com.
Ein neuer Server ist unter schokokeks.org " -"verfügbar.
Möchtest du zum neuen Server wechseln? (dringend " -"empfohlen)" +"Das openstreetbugs-Plugin verwendet den alten Server auf appspot.com." +"
Ein neuer Server ist unter schokokeks.org verfügbar.
Möchtest du zum " +"neuen Server wechseln? (dringend empfohlen)" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 @@ -13771,6 +13923,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 "" "Die Kopfzeile enthält mehrere Werte und kann nicht in eine Zeichenkette " @@ -13859,9 +14010,10 @@ msgstr "Dateiendung unbekannt: {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 "Osmarender" -#: ../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 " @@ -13871,9 +14023,5 @@ "den Pfad zu Firefox ein." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "Einstellungen für Osmarender" - -#: ../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 "Firefox-Programm" @@ -13881,5 +14029,5 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 msgid "PicLayer" -msgstr "BildEbene" +msgstr "PicLayer" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 @@ -13905,6 +14053,5 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "A plugin that allows JOSM to be controlled from other applications." -msgstr "" -"Ein Plugin, das es anderen Programmen erlaubt, JOSM zu kontrollieren." +msgstr "Ein Plugin, das es anderen Programmen erlaubt, JOSM zu kontrollieren." #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 @@ -14256,17 +14403,17 @@ "Sie müssen zuerst in den Einstellungen eine Quelle für Vorlagen angeben." -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" msgstr "Gebäudeteilung umkehren" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37 msgid "Reverses house numbers on a terrace." msgstr "Hausnummern der Gebäudeteilung umkehren" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 msgid "Reverse a Terrace" msgstr "Gebäudeteilung umkehren" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110 msgid "Reverse Terrace" msgstr "Gebäudeteilung umkehren" @@ -14310,171 +14457,4 @@ msgid "Optional" msgstr "Optional" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "Überlappende Flächen verbinden" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Joins areas that overlap each other" -msgstr "Sich überlappende Flächen miteinander verbinden" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 -msgid "Only up to two areas can be joined at the moment." -msgstr "Momentan können nur maximal zwei Flächen vereinigt werden." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 -#, java-format -msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "" -"\"{0}\" ist nicht geschlossen und kann deshalb nicht vereinigt werden." - -#: ../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 "" -"Die ausgewählten Wege haben Knoten außerhalb des heruntergeladenen " -"Datenbereichs.\n" -"Das kann zu unabsichtlich gelöschten Knoten führen.\n" -"Sind Sie sich sicher, dass Sie fortfahren wollen?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 -msgid "Please abort if you are not sure" -msgstr "Bitte abbrechen, falls Sie nicht sicher sind" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 -msgid "Please select at least one closed way the should be joined." -msgstr "Bitte mindestens einen geschlossenen Weg zum Vereinigen wählen." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175 -msgid "No intersection found. Nothing was changed." -msgstr "Keine Überschneidung gefunden. Es wurde nichts geändert." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197 -msgid "Added node on all intersections" -msgstr "Knoten auf allen Schnittpunkten erstellt" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221 -msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "Wege entfernen, die nicht teil des inneren Multipolygons sind" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226 -msgid "Fix relations" -msgstr "Relationen korrigieren" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 -msgid "Joined self-overlapping area" -msgstr "Selbstüberlappende Gebiete verbunden" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 -msgid "Joined overlapping areas" -msgstr "Überlappende Gebiete verbunden" - -#: ../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 "" -"Einige der Wege waren Teil von Relationen, welche geändert wurden. Bitte " -"prüfen Sie, dass keine Fehler entstanden sind." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 -msgid "Enter values for all conflicts." -msgstr "Werte für alle Konflikte festlegen." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Konflikte auflösen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312 -msgid "Fix tag conflicts" -msgstr "Merkmalskonflikte beheben" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462 -msgid "Removed Element from Relations" -msgstr "Elemente aus Relationen entfernt" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571 -msgid "Join Areas: Remove Short Ways" -msgstr "Flächen verbinden: Kurze Wege entfernen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587 -msgid "Closed Way" -msgstr "Weg geschlossen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854 -msgid "Remove tags from inner ways" -msgstr "Merkmale von inneren Wegen entfernen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883 -msgid "Join Areas Function" -msgstr "Funktion zum Flächen verbinden" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Jump To Position" -msgstr "Zu Position springen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Opens a dialog that allows to jump to a specific location" -msgstr "Einen Dialog zum Springen an eine spezifische Position öffnen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 -msgid "Enter Lat/Lon to jump to position." -msgstr "Länge und Breite der Sprungposition angeben." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 -msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "Sie können auch eine URL von www.openstreetmap.org einfügen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 -msgid "Zoom (in metres)" -msgstr "Zoom (in Meter)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -msgid "Jump there" -msgstr "Dorthin springen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 -msgid "Jump to Position" -msgstr "Zu Position springen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Could not parse Latitude, Longitude or Zoom. Please check." -msgstr "Länge, Breite oderZoom konnten nicht gelesen werden. Bitte prüfen." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Unable to parse Lon/Lat" -msgstr "Länge oder Breite nicht lesbar" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Simplify Way" -msgstr "Weg vereinfachen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Unnötige Knotenpunkte eines Weges löschen." - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "Bitte mindestens einen Weg zum Vereinfachen auswählen." - -#: ../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] "" -"Diese Auswahl enthält {0} Weg. Sind Sie sich, dass er vereinfacht werden " -"soll?" -msgstr[1] "" -"Diese Auswahl enthält {0} Wege. Sind Sie sich, dass alle vereinfacht werden " -"sollen?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "Sind Sie sicher?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14574,5 +14554,5 @@ msgstr "Datenprüfung: Andere" -#: ../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}" @@ -14625,34 +14605,34 @@ msgstr "Ausgewählte Fehler beim nächsten Mal ignorieren." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Komplette Gruppe" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Einzelne Elemente" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Nichts" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Ganze Gruppe oder einzelne Elemente ignorieren?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 msgid "Ignoring elements" msgstr "Elemente ignorieren" -#: ../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 "Fehler werden berichtigt ..." -#: ../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 "Berichtigung ({0}/{1}): ''{2}''" -#: ../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 "Karte wird aktuallisiert ..." @@ -14704,18 +14684,18 @@ msgstr "Überschneidende Wege" -#: ../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 "Doppelte Knoten" -#: ../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 "Dieser Test überprüft auf doppelte Knoten an der selben Stelle." -#: ../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 "Knoten auf derselben Position" -#: ../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 "Bestätigung" @@ -14958,11 +14938,9 @@ #: ../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." -msgstr "" -"Die Datenquellen (URL oder Dateiname) für die Rechtschreib- (siehe " -"http://wiki.openstreetmap.org/index.php/User:JLS/speller) oder " -"Merkmalsprüfung." +"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." +"org/index.php/User:JLS/speller) or tag checking data files." +msgstr "" +"Die Datenquellen (URL oder Dateiname) für die Rechtschreib- (siehe http://" +"wiki.openstreetmap.org/index.php/User:JLS/speller) oder Merkmalsprüfung." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 @@ -15107,5 +15085,5 @@ #. 50000 #. -#. +#. #. #. @@ -15113,5 +15091,5 @@ #. #. -#. +#. #. #. @@ -15121,5 +15099,5 @@ #. 50000 #. -#. +#. #. #. @@ -15128,5 +15106,5 @@ #. 50000 #. -#. +#. #. #. @@ -15135,5 +15113,5 @@ #. 50000 #. -#. +#. #. #. @@ -15142,5 +15120,5 @@ #. 50000 #. -#. +#. #. #. @@ -15149,5 +15127,5 @@ #. 50000 #. -#. +#. #. #. @@ -15156,9 +15134,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -15203,5 +15181,5 @@ #. 50000 #. -#. +#. #. #. @@ -15346,14 +15324,14 @@ msgstr "WalkingPapers" -#: ../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 "Wege-Herunterladen" -#: ../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 "Kartendaten mit Anschluss zu einem der Wegenden herunterladen" -#: ../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 " @@ -15365,5 +15343,5 @@ "Knoten am Anfang oder Ende eines Weges oder den ganzen Weg aus." -#: ../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 "" @@ -15371,5 +15349,5 @@ "gestartet werden könnte." -#: ../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." @@ -15377,5 +15355,5 @@ "Es sind keine Weg mit dem Knoten ''{0}'' verbunden. Abbruch." -#: ../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 "" @@ -15386,5 +15364,5 @@ "dem Herunterladen verschwunden" -#: ../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 "" @@ -15397,17 +15375,17 @@ "Es gibt keinen weiteren Weg zum herunterladen,
aber eine " "potentielle Doublette des ausgewählten Knotens wurde gefunden.

Der " -"ausgewählte Knoten ist ''{0}''.
Die potentielle Doublette is " -"''{1}''.
Soll die potentielle Doublette mit dem ausgewählten Knoten " +"ausgewählte Knoten ist ''{0}''.
Die potentielle Doublette is ''{1}''." +"
Soll die potentielle Doublette mit dem ausgewählten Knoten " "zusammengeführt und das Herunterladen fortgesetzt werden?" -#: ../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 "Doppelten Knoten zusammenführen?" -#: ../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 "Keine weiteren verbundenen Wege zum Herunterladen." -#: ../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." @@ -15578,50 +15556,50 @@ "die Auflösung" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "Sichtbare Kacheln laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "Auflösung ändern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Reload erroneous tiles" msgstr "Fehlerhafte Kacheln neu laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Alpha channel" msgstr "Alphakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:369 msgid "Save WMS layer to file" msgstr "WMS-Ebene in Datei speichern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "WMS-Ebene speichern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "WMS-Ebene aus Datei laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "WMS-Ebene laden" -#: ../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 "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "File Format Error" msgstr "Dateiformatfehler" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "Fehler beim Laden der Datei" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "WMS_Lesezeichen erstellen" @@ -15697,5 +15675,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 "" @@ -15718,6 +15696,6 @@ msgstr "" "Die maximale Downloadgröße ist 0.25 und Ihre Anfrage war zu groß. Fordern " -"Sie entweder einen kleineren Ausschnitt an oder nutzen Sie die Datei " -"planet.osm." +"Sie entweder einen kleineren Ausschnitt an oder nutzen Sie die Datei planet." +"osm." #. OSM server message @@ -15740,24 +15718,17 @@ #. Plugin AddrInterpolation #: build/trans_plugins.java:3 -msgid "Group common Address Interpolation inputs in a single dialog," -msgstr "Gruppiert bekannte Adressinterpolation in einem Dialogfenster." - -#. 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 "" -"Ein weiteres Georeferenzierungsplugin für JOSM. Es korreliert Bilder mit GPS-" -"Spuren oder importiert mit EXIF georeferenzierte Bilder." - -#. Plugin cadastre-fr +msgid "A special handler for the French land registry WMS server." +msgstr "" +"Ein spezielles Plugin für die WMS-Server der französischen Landesvermessung." + +#. Plugin colorscheme #: build/trans_plugins.java:7 -msgid "A special handler for the French land registry WMS server." -msgstr "" -"Ein spezielles Plugin für die WMS-Server der französischen Landesvermessung." - -#. Plugin colorscheme -#: build/trans_plugins.java:9 msgid "" "Allows the user to create different color schemes and to switch between " @@ -15774,10 +15745,10 @@ #. Plugin Create_grid_of_ways -#: build/trans_plugins.java:11 +#: build/trans_plugins.java:9 msgid "Create a grid of ways." msgstr "Erzeugt ein Wegegitter." #. Plugin czechaddress -#: build/trans_plugins.java:13 +#: build/trans_plugins.java:11 msgid "" "Creating and handling address nodes and buildings within Czech Republic." @@ -15787,10 +15758,10 @@ #. Plugin dataimport -#: build/trans_plugins.java:15 +#: build/trans_plugins.java:13 msgid "Allows to import various file formats into JOSM directly." msgstr "Ermöglicht den direkten Import verschiedener Dateiformate in JOSM." #. Plugin DirectUpload -#: build/trans_plugins.java:17 +#: build/trans_plugins.java:15 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " @@ -15801,10 +15772,10 @@ #. Plugin Duplicate-Way -#: build/trans_plugins.java:19 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "Wege mit einem Versatz duplizieren." #. Plugin editgpx -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -15815,22 +15786,21 @@ #. Plugin globalsat +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." +msgstr "" +"GPS-Daten vom Datenlogger Globalsat DG100 direkt in JOSM herunterladen." + +#. Plugin graphview #: build/trans_plugins.java:23 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." -msgstr "" -"GPS-Daten vom Datenlogger Globalsat DG100 direkt in JOSM herunterladen." - -#. Plugin graphview -#: build/trans_plugins.java:25 msgid "Visualizes routing information as a routing graph." msgstr "Visualisiert Routeninformationen als Routengraph." #. Plugin grid -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Erstellt eine Hintergrundebene, die ein Kartennetz anzeigt" #. Plugin ImageWayPoint -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -15843,10 +15813,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Hilfe beim Vektorisieren von WMS-Bildern." #. Plugin livegps -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -15856,5 +15826,5 @@ #. Plugin measurement -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -15867,10 +15837,10 @@ #. Plugin michigan_left -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:35 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "Fügt Abbiegeverbote nach links für 4 oder 5 ausgewählte Wege hinzu" #. Plugin multipoly -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:37 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -15881,5 +15851,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 " @@ -15892,15 +15862,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:41 msgid "Displays an OpenLayers background image" msgstr "Zeigt ein OpenLayers Hintergrundbild" #. Plugin openstreetbugs -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:43 msgid "Imports issues from OpenStreetBugs" msgstr "Importiert Berichte von OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:45 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -15910,12 +15880,12 @@ #. Plugin osmarender +#: build/trans_plugins.java:47 +msgid "" +"Launches FireFox to display the current visible screen as a nice SVG image." +msgstr "" +"Startet FireFox, um den gerade sichtbaren Bereich als SVG-Bild darzustellen." + +#. Plugin PicLayer #: build/trans_plugins.java:49 -msgid "" -"Launches FireFox to display the current visible screen as a nice SVG image." -msgstr "" -"Startet FireFox, um den gerade sichtbaren Bereich als SVG-Bild darzustellen." - -#. Plugin PicLayer -#: build/trans_plugins.java:51 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -15926,15 +15896,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:51 msgid "The great JGoodies Plastic Look and Feel." msgstr "Das großartige Plastic-Design von JGoodies." #. Plugin remotecontrol -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:53 msgid "Let other applications send commands to JOSM." msgstr "Erlaubt anderen Programmen Kommandos an JOSM zu senden." #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15945,10 +15915,10 @@ #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:57 msgid "Provides routing capabilities." msgstr "Bietet Routenführungsmöglichkeiten." #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:59 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -15959,16 +15929,15 @@ #. Plugin surveyor +#: build/trans_plugins.java:61 +msgid "Allow adding markers/nodes on current gps positions." +msgstr "Erlaubt Markierungen/Knoten an der aktuellen GPS Position einzufügen." + +#. Plugin tageditor #: build/trans_plugins.java:63 -msgid "Allow adding markers/nodes on current gps positions." -msgstr "" -"Erlaubt Markierungen/Knoten an der aktuellen GPS Position einzufügen." - -#. Plugin tageditor -#: build/trans_plugins.java:65 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Öffnet einen Dialog, um Merkmale in einer Tabelle zu bearbeiten." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:65 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -15981,19 +15950,10 @@ #. Plugin terracer -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:67 msgid "Make terraced houses out of single blocks." msgstr "Erstellt Reihenhäuser aus einem Häuserblock." -#. 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 "" -"Etliche Werkzeuge, welche einem das Leben vereinfachen. Zum Beispiel Weg " -"vereinfachen, Flächen verbinden, Springe zur Position" - #. Plugin validator -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -16005,5 +15965,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -16015,15 +15975,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "Leichtes Herunterladen entlang einer langen Reihe verbundener Wege" #. Plugin wmsplugin -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." msgstr "" -"Zeigt georeferenzierte Bilder als Hintergrund in JOSM (WMS Server, Yahoo, " -"...)." +"Zeigt georeferenzierte Bilder als Hintergrund in JOSM (WMS Server, " +"Yahoo, ...)." #. #. -#. +#. #. #. @@ -17271,5 +17231,5 @@ #. color motorroad #. -#. +#. #. #. @@ -17279,5 +17239,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17296,5 +17256,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17304,5 +17264,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17321,5 +17281,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17329,5 +17289,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17346,5 +17306,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17354,5 +17314,5 @@ #. 300000 #. -#. +#. #. #. @@ -17367,5 +17327,5 @@ #. 300000 #. -#. +#. #. #. @@ -17383,5 +17343,5 @@ #. 50000 #. -#. +#. #. #. @@ -17399,5 +17359,5 @@ #. 40000 #. -#. +#. #. #. @@ -17406,5 +17366,5 @@ #. 40000 #. -#. +#. #. #. @@ -17414,5 +17374,5 @@ #. 50000 #. -#. +#. #. #. @@ -17432,5 +17392,5 @@ #. 50000 #. -#. +#. #. #. @@ -17439,5 +17399,5 @@ #. 50000 #. -#. +#. #. #. @@ -17447,5 +17407,5 @@ #. 50000 #. -#. +#. #. #. @@ -17495,7 +17455,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -18194,5 +18154,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -18231,5 +18191,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -18325,5 +18285,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -18480,5 +18440,5 @@ #. 50000 #. -#. +#. #. #. @@ -19865,5 +19825,5 @@ #. 30000 #. -#. +#. #. #. @@ -19873,5 +19833,5 @@ #. 40000 #. -#. +#. #. #. @@ -19881,5 +19841,5 @@ #. 20000 #. -#. +#. #. #. @@ -19889,5 +19849,5 @@ #. 40000 #. -#. +#. #. #. @@ -20245,7 +20205,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -20255,5 +20215,5 @@ #. 50000 #. -#. +#. #. #. @@ -20263,5 +20223,5 @@ #. 50000 #. -#. +#. #. #. @@ -20271,5 +20231,5 @@ #. 50000 #. -#. +#. #. #. @@ -20279,5 +20239,5 @@ #. 50000 #. -#. +#. #. #. @@ -20287,5 +20247,5 @@ #. 50000 #. -#. +#. #. #. @@ -20295,5 +20255,5 @@ #. 50000 #. -#. +#. #. #. @@ -20303,5 +20263,5 @@ #. 50000 #. -#. +#. #. #. @@ -20311,5 +20271,5 @@ #. 50000 #. -#. +#. #. #. @@ -20319,5 +20279,5 @@ #. 50000 #. -#. +#. #. #. @@ -20327,5 +20287,5 @@ #. 50000 #. -#. +#. #. #. @@ -20335,5 +20295,5 @@ #. 50000 #. -#. +#. #. #. @@ -20343,5 +20303,5 @@ #. 50000 #. -#. +#. #. #. @@ -20351,5 +20311,5 @@ #. 50000 #. -#. +#. #. #. @@ -20359,5 +20319,5 @@ #. 50000 #. -#. +#. #. #. @@ -20367,5 +20327,5 @@ #. 50000 #. -#. +#. #. #. @@ -20375,5 +20335,5 @@ #. 50000 #. -#. +#. #. #. @@ -20383,5 +20343,5 @@ #. 50000 #. -#. +#. #. #. @@ -20391,5 +20351,5 @@ #. 50000 #. -#. +#. #. #. @@ -20399,5 +20359,5 @@ #. 50000 #. -#. +#. #. #. @@ -20407,5 +20367,5 @@ #. 50000 #. -#. +#. #. #. @@ -20415,5 +20375,5 @@ #. 50000 #. -#. +#. #. #. @@ -20423,5 +20383,5 @@ #. 50000 #. -#. +#. #. #. @@ -20431,5 +20391,5 @@ #. 50000 #. -#. +#. #. #. @@ -20439,5 +20399,5 @@ #. 50000 #. -#. +#. #. #. @@ -20447,5 +20407,5 @@ #. 50000 #. -#. +#. #. #. @@ -20455,5 +20415,5 @@ #. 50000 #. -#. +#. #. #. @@ -20463,5 +20423,5 @@ #. 50000 #. -#. +#. #. #. @@ -20471,5 +20431,5 @@ #. 50000 #. -#. +#. #. #. @@ -20479,5 +20439,5 @@ #. 50000 #. -#. +#. #. #. @@ -20487,5 +20447,5 @@ #. 50000 #. -#. +#. #. #. @@ -20495,5 +20455,5 @@ #. 50000 #. -#. +#. #. #. @@ -20503,5 +20463,5 @@ #. 50000 #. -#. +#. #. #. @@ -20511,5 +20471,5 @@ #. 50000 #. -#. +#. #. #. @@ -20519,5 +20479,5 @@ #. 50000 #. -#. +#. #. #. @@ -20527,5 +20487,5 @@ #. 50000 #. -#. +#. #. #. @@ -20535,5 +20495,5 @@ #. 50000 #. -#. +#. #. #. @@ -20543,5 +20503,5 @@ #. 50000 #. -#. +#. #. #. @@ -20551,5 +20511,5 @@ #. 50000 #. -#. +#. #. #. @@ -20559,5 +20519,5 @@ #. 50000 #. -#. +#. #. #. @@ -20567,5 +20527,5 @@ #. 50000 #. -#. +#. #. #. @@ -20575,5 +20535,5 @@ #. 50000 #. -#. +#. #. #. @@ -20583,5 +20543,5 @@ #. 50000 #. -#. +#. #. #. @@ -20591,5 +20551,5 @@ #. 50000 #. -#. +#. #. #. @@ -20599,5 +20559,5 @@ #. 50000 #. -#. +#. #. #. @@ -20607,5 +20567,5 @@ #. 50000 #. -#. +#. #. #. @@ -20615,5 +20575,5 @@ #. 50000 #. -#. +#. #. #. @@ -22307,7 +22267,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22317,5 +22277,5 @@ #. 50000 #. -#. +#. #. #. @@ -22325,5 +22285,5 @@ #. 50000 #. -#. +#. #. #. @@ -22333,5 +22293,5 @@ #. 50000 #. -#. +#. #. #. @@ -22341,5 +22301,5 @@ #. 50000 #. -#. +#. #. #. @@ -22349,5 +22309,5 @@ #. 50000 #. -#. +#. #. #. @@ -22357,5 +22317,5 @@ #. 50000 #. -#. +#. #. #. @@ -22365,5 +22325,5 @@ #. 50000 #. -#. +#. #. #. @@ -23694,5 +23654,5 @@ #. 40000 #. -#. +#. #. #. @@ -23708,5 +23668,5 @@ #. 30000 #. -#. +#. #. #. @@ -23717,7 +23677,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23727,5 +23687,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -23735,13 +23703,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -23751,5 +23711,5 @@ #. 50000 #. -#. +#. #. #. @@ -23782,5 +23742,5 @@ #. 50000 #. -#. +#. #. #. @@ -23796,5 +23756,5 @@ #. 50000 #. -#. +#. #. #. @@ -23804,5 +23764,5 @@ #. 10000 #. -#. +#. #. #. @@ -23812,5 +23772,5 @@ #. 10000 #. -#. +#. #. #. @@ -23821,5 +23781,5 @@ #. 10000 #. -#. +#. #. #. @@ -23848,5 +23808,5 @@ #. 50000 #. -#. +#. #. #. @@ -23961,9 +23921,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 @@ -23971,5 +23931,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, @@ -23979,8 +23939,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 @@ -23994,5 +23954,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -24000,5 +23960,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -24047,6 +24007,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -24126,5 +24086,5 @@ #. 40000 #. -#. +#. #. #. @@ -24134,5 +24094,5 @@ #. 10000 #. -#. +#. #. #. @@ -24141,5 +24101,5 @@ #. 50000 #. -#. +#. #. #. @@ -24149,5 +24109,5 @@ #. 50000 #. -#. +#. #. #. @@ -24156,5 +24116,5 @@ #. 50000 #. -#. +#. #. #. @@ -24163,5 +24123,5 @@ #. 50000 #. -#. +#. #. #. @@ -24170,5 +24130,5 @@ #. 50000 #. -#. +#. #. #. @@ -24177,5 +24137,5 @@ #. 50000 #. -#. +#. #. #. @@ -24184,5 +24144,5 @@ #. 40000 #. -#. +#. #. #. @@ -24191,5 +24151,5 @@ #. 50000 #. -#. +#. #. #. @@ -24198,5 +24158,5 @@ #. 50000 #. -#. +#. #. #. @@ -24205,5 +24165,5 @@ #. 50000 #. -#. +#. #. #. @@ -24212,5 +24172,5 @@ #. 50000 #. -#. +#. #. #. @@ -24219,5 +24179,5 @@ #. 50000 #. -#. +#. #. #. @@ -24226,5 +24186,5 @@ #. 50000 #. -#. +#. #. #. @@ -24234,5 +24194,5 @@ #. 50000 #. -#. +#. #. #. @@ -24241,5 +24201,5 @@ #. 50000 #. -#. +#. #. #. @@ -24250,5 +24210,5 @@ #. 50000 #. -#. +#. #. #. @@ -24260,11 +24220,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -24273,7 +24233,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24284,5 +24244,5 @@ #. 50000 #. -#. +#. #. #. @@ -24293,5 +24253,5 @@ #. 50000 #. -#. +#. #. #. @@ -24302,5 +24262,5 @@ #. 50000 #. -#. +#. #. #. @@ -24311,5 +24271,5 @@ #. 50000 #. -#. +#. #. #. @@ -24320,5 +24280,5 @@ #. 50000 #. -#. +#. #. #. @@ -24329,5 +24289,5 @@ #. 40000 #. -#. +#. #. #. @@ -24339,5 +24299,5 @@ #. 50000 #. -#. +#. #. #. @@ -24348,5 +24308,5 @@ #. 50000 #. -#. +#. #. #. @@ -24371,5 +24331,5 @@ #. 10000 #. -#. +#. #. #. @@ -24378,5 +24338,5 @@ #. 50000 #. -#. +#. #. #. @@ -24385,5 +24345,5 @@ #. 50000 #. -#. +#. #. #. @@ -24399,5 +24359,5 @@ #. 20000 #. -#. +#. #. #. @@ -24411,5 +24371,5 @@ #. 30000 #. -#. +#. #. #. @@ -24418,5 +24378,5 @@ #. 50000 #. -#. +#. #. #. @@ -24425,5 +24385,5 @@ #. 50000 #. -#. +#. #. #. @@ -24432,5 +24392,5 @@ #. 50000 #. -#. +#. #. #. @@ -24439,5 +24399,5 @@ #. 50000 #. -#. +#. #. #. @@ -24446,5 +24406,5 @@ #. 50000 #. -#. +#. #. #. @@ -24453,5 +24413,5 @@ #. 50000 #. -#. +#. #. #. @@ -24460,5 +24420,5 @@ #. 50000 #. -#. +#. #. #. @@ -24467,5 +24427,5 @@ #. 50000 #. -#. +#. #. #. @@ -24474,5 +24434,5 @@ #. 50000 #. -#. +#. #. #. @@ -24481,5 +24441,5 @@ #. 50000 #. -#. +#. #. #. @@ -24488,5 +24448,5 @@ #. 50000 #. -#. +#. #. #. @@ -24495,5 +24455,5 @@ #. 50000 #. -#. +#. #. #. @@ -24502,5 +24462,5 @@ #. 50000 #. -#. +#. #. #. @@ -24509,5 +24469,5 @@ #. 50000 #. -#. +#. #. #. @@ -24678,7 +24638,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24692,5 +24652,5 @@ #. 40000 #. -#. +#. #. #. @@ -24700,7 +24660,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24710,5 +24670,5 @@ #. 50000 #. -#. +#. #. #. @@ -24718,5 +24678,5 @@ #. 50000 #. -#. +#. #. #. @@ -24726,5 +24686,5 @@ #. 50000 #. -#. +#. #. #. @@ -24734,5 +24694,5 @@ #. 50000 #. -#. +#. #. #. @@ -24748,5 +24708,5 @@ #. 10000 #. -#. +#. #. #. @@ -24756,5 +24716,5 @@ #. 50000 #. -#. +#. #. #. @@ -24764,5 +24724,5 @@ #. 50000 #. -#. +#. #. #. @@ -24772,5 +24732,5 @@ #. 50000 #. -#. +#. #. #. @@ -24780,5 +24740,5 @@ #. 50000 #. -#. +#. #. #. @@ -24788,5 +24748,5 @@ #. 50000 #. -#. +#. #. #. @@ -24796,5 +24756,5 @@ #. 50000 #. -#. +#. #. #. @@ -24813,5 +24773,5 @@ #. 50000 #. -#. +#. #. #. @@ -24820,5 +24780,5 @@ #. 50000 #. -#. +#. #. #. @@ -24832,5 +24792,5 @@ #. 50000 #. -#. +#. #. #. @@ -24844,5 +24804,5 @@ #. 50000 #. -#. +#. #. #. @@ -24851,5 +24811,5 @@ #. 50000 #. -#. +#. #. #. @@ -24863,5 +24823,5 @@ #. 50000 #. -#. +#. #. #. @@ -24876,5 +24836,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24889,5 +24849,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24901,5 +24861,5 @@ #. 50000 #. -#. +#. #. #. @@ -24913,5 +24873,5 @@ #. 50000 #. -#. +#. #. #. @@ -24920,5 +24880,5 @@ #. 50000 #. -#. +#. #. #. @@ -24927,5 +24887,5 @@ #. 50000 #. -#. +#. #. #. @@ -24939,5 +24899,5 @@ #. 50000 #. -#. +#. #. #. @@ -24947,5 +24907,5 @@ #. 50000 #. -#. +#. #. #. @@ -24954,5 +24914,5 @@ #. 50000 #. -#. +#. #. #. @@ -24961,5 +24921,5 @@ #. 50000 #. -#. +#. #. #. @@ -24968,5 +24928,5 @@ #. 50000 #. -#. +#. #. #. @@ -24976,5 +24936,5 @@ #. 50000 #. -#. +#. #. #. @@ -24985,5 +24945,5 @@ #. 50000 #. -#. +#. #. #. @@ -24993,7 +24953,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25003,5 +24963,5 @@ #. 50000 #. -#. +#. #. #. @@ -25011,5 +24971,5 @@ #. 50000 #. -#. +#. #. #. @@ -25019,5 +24979,5 @@ #. 50000 #. -#. +#. #. #. @@ -25028,5 +24988,5 @@ #. 50000 #. -#. +#. #. #. @@ -25036,5 +24996,5 @@ #. 50000 #. -#. +#. #. #. @@ -25044,5 +25004,5 @@ #. 50000 #. -#. +#. #. #. @@ -25052,5 +25012,5 @@ #. 50000 #. -#. +#. #. #. @@ -25060,5 +25020,5 @@ #. 50000 #. -#. +#. #. #. @@ -25068,5 +25028,5 @@ #. 50000 #. -#. +#. #. #. @@ -25076,5 +25036,5 @@ #. 50000 #. -#. +#. #. #. @@ -25084,5 +25044,5 @@ #. 50000 #. -#. +#. #. #. @@ -25092,5 +25052,5 @@ #. 50000 #. -#. +#. #. #. @@ -25113,7 +25073,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25123,5 +25083,5 @@ #. 50000 #. -#. +#. #. #. @@ -25130,5 +25090,5 @@ #. 50000 #. -#. +#. #. #. @@ -25138,5 +25098,5 @@ #. 50000 #. -#. +#. #. #. @@ -25145,5 +25105,5 @@ #. 50000 #. -#. +#. #. #. @@ -25153,5 +25113,5 @@ #. 50000 #. -#. +#. #. #. @@ -25161,5 +25121,5 @@ #. 50000 #. -#. +#. #. #. @@ -25175,5 +25135,5 @@ #. 200000000 #. -#. +#. #. #. @@ -25184,5 +25144,5 @@ #. 50000 #. -#. +#. #. #. @@ -25201,5 +25161,5 @@ #. 50000 #. -#. +#. #. #. @@ -25209,5 +25169,5 @@ #. 50000 #. -#. +#. #. #. @@ -25220,5 +25180,5 @@ #. 50000 #. -#. +#. #. #. @@ -25236,5 +25196,5 @@ #. 50000 #. -#. +#. #. #. @@ -25243,5 +25203,5 @@ #. 50000 #. -#. +#. #. #. @@ -25250,5 +25210,5 @@ #. 50000 #. -#. +#. #. #. @@ -25257,7 +25217,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25268,5 +25228,5 @@ #. 50000 #. -#. +#. #. #. @@ -25281,5 +25241,5 @@ #. 50000 #. -#. +#. #. #. @@ -25293,5 +25253,5 @@ #. 50000 #. -#. +#. #. #. @@ -25301,5 +25261,5 @@ #. 50000 #. -#. +#. #. #. @@ -25313,5 +25273,5 @@ #. 50000 #. -#. +#. #. #. @@ -25325,5 +25285,5 @@ #. 50000 #. -#. +#. #. #. @@ -25332,7 +25292,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25342,5 +25302,5 @@ #. 50000 #. -#. +#. #. #. @@ -25350,5 +25310,5 @@ #. 50000 #. -#. +#. #. #. @@ -25358,5 +25318,5 @@ #. 50000 #. -#. +#. #. #. @@ -25366,5 +25326,5 @@ #. 50000 #. -#. +#. #. #. @@ -25380,7 +25340,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25395,5 +25355,5 @@ #. 30000 #. -#. +#. #. #. @@ -25408,5 +25368,5 @@ #. 30000 #. -#. +#. #. #. @@ -25421,5 +25381,5 @@ #. 30000 #. -#. +#. #. #. @@ -25434,5 +25394,5 @@ #. 30000 #. -#. +#. #. #. @@ -25447,5 +25407,5 @@ #. 30000 #. -#. +#. #. #. @@ -25460,7 +25420,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -25470,5 +25430,5 @@ #. 50000 #. -#. +#. #. #. @@ -25477,5 +25437,5 @@ #. 50000 #. -#. +#. #. #. @@ -25485,5 +25445,5 @@ #. 50000 #. -#. +#. #. #. @@ -25493,5 +25453,5 @@ #. 50000 #. -#. +#. #. #. @@ -25501,5 +25461,5 @@ #. 50000 #. -#. +#. #. #. @@ -25509,5 +25469,5 @@ #. 50000 #. -#. +#. #. #. @@ -25517,5 +25477,5 @@ #. 50000 #. -#. +#. #. #. @@ -25525,5 +25485,5 @@ #. 50000 #. -#. +#. #. #. @@ -25533,5 +25493,5 @@ #. 50000 #. -#. +#. #. #. @@ -25541,5 +25501,5 @@ #. 50000 #. -#. +#. #. #. @@ -25549,5 +25509,5 @@ #. 50000 #. -#. +#. #. #. @@ -25557,5 +25517,5 @@ #. 50000 #. -#. +#. #. #. @@ -25565,5 +25525,5 @@ #. 50000 #. -#. +#. #. #. @@ -25583,5 +25543,5 @@ #. 50000 #. -#. +#. #. #. @@ -25596,5 +25556,5 @@ #. 50000 #. -#. +#. #. #. @@ -25607,7 +25567,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25617,5 +25577,5 @@ #. 50000 #. -#. +#. #. #. @@ -25625,5 +25585,5 @@ #. 50000 #. -#. +#. #. #. @@ -25633,5 +25593,5 @@ #. 50000 #. -#. +#. #. #. @@ -25641,5 +25601,5 @@ #. 50000 #. -#. +#. #. #. @@ -25649,5 +25609,5 @@ #. 50000 #. -#. +#. #. #. @@ -25657,5 +25617,5 @@ #. 50000 #. -#. +#. #. #. @@ -25665,5 +25625,5 @@ #. 50000 #. -#. +#. #. #. @@ -25673,5 +25633,5 @@ #. 50000 #. -#. +#. #. #. @@ -25681,5 +25641,5 @@ #. 50000 #. -#. +#. #. #. @@ -25689,5 +25649,5 @@ #. 50000 #. -#. +#. #. #. @@ -25697,5 +25657,5 @@ #. 50000 #. -#. +#. #. #. @@ -25705,5 +25665,5 @@ #. 50000 #. -#. +#. #. #. @@ -25713,5 +25673,5 @@ #. 50000 #. -#. +#. #. #. @@ -25721,5 +25681,5 @@ #. 50000 #. -#. +#. #. #. @@ -25740,5 +25700,5 @@ #. 50000 #. -#. +#. #. #. @@ -25752,7 +25712,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25762,5 +25722,5 @@ #. 50000 #. -#. +#. #. #. @@ -25770,5 +25730,5 @@ #. 50000 #. -#. +#. #. #. @@ -25778,5 +25738,5 @@ #. 50000 #. -#. +#. #. #. @@ -25786,5 +25746,5 @@ #. 50000 #. -#. +#. #. #. @@ -25794,5 +25754,5 @@ #. 50000 #. -#. +#. #. #. @@ -25802,5 +25762,5 @@ #. 50000 #. -#. +#. #. #. @@ -25810,5 +25770,5 @@ #. 50000 #. -#. +#. #. #. @@ -25825,5 +25785,5 @@ #. 50000 #. -#. +#. #. #. @@ -25833,5 +25793,5 @@ #. 50000 #. -#. +#. #. #. @@ -25841,5 +25801,5 @@ #. 50000 #. -#. +#. #. #. @@ -25849,5 +25809,5 @@ #. 50000 #. -#. +#. #. #. @@ -25857,5 +25817,5 @@ #. 50000 #. -#. +#. #. #. @@ -25865,5 +25825,5 @@ #. 50000 #. -#. +#. #. #. @@ -25873,5 +25833,5 @@ #. 50000 #. -#. +#. #. #. @@ -25881,5 +25841,5 @@ #. 50000 #. -#. +#. #. #. @@ -25889,5 +25849,5 @@ #. 50000 #. -#. +#. #. #. @@ -25897,5 +25857,5 @@ #. 50000 #. -#. +#. #. #. @@ -25905,5 +25865,5 @@ #. 50000 #. -#. +#. #. #. @@ -25913,5 +25873,5 @@ #. 50000 #. -#. +#. #. #. @@ -25930,5 +25890,5 @@ #. 50000 #. -#. +#. #. #. @@ -25938,5 +25898,5 @@ #. 50000 #. -#. +#. #. #. @@ -25945,5 +25905,5 @@ #. 50000 #. -#. +#. #. #. @@ -25953,5 +25913,5 @@ #. 50000 #. -#. +#. #. #. @@ -25961,5 +25921,5 @@ #. 50000 #. -#. +#. #. #. @@ -25969,5 +25929,5 @@ #. 50000 #. -#. +#. #. #. @@ -25976,5 +25936,5 @@ #. 50000 #. -#. +#. #. #. @@ -25984,5 +25944,5 @@ #. 50000 #. -#. +#. #. #. @@ -25992,5 +25952,5 @@ #. 50000 #. -#. +#. #. #. @@ -26000,5 +25960,5 @@ #. 50000 #. -#. +#. #. #. @@ -26008,5 +25968,5 @@ #. 50000 #. -#. +#. #. #. @@ -26015,5 +25975,5 @@ #. 50000 #. -#. +#. #. #. @@ -26022,5 +25982,5 @@ #. 50000 #. -#. +#. #. #. @@ -26029,5 +25989,5 @@ #. 50000 #. -#. +#. #. #. @@ -26036,5 +25996,5 @@ #. 50000 #. -#. +#. #. #. @@ -26043,5 +26003,5 @@ #. 50000 #. -#. +#. #. #. @@ -26050,5 +26010,5 @@ #. 50000 #. -#. +#. #. #. @@ -26057,5 +26017,5 @@ #. 50000 #. -#. +#. #. #. @@ -26064,5 +26024,5 @@ #. 50000 #. -#. +#. #. #. @@ -26071,5 +26031,5 @@ #. 50000 #. -#. +#. #. #. @@ -26078,5 +26038,5 @@ #. 50000 #. -#. +#. #. #. @@ -26085,5 +26045,5 @@ #. 50000 #. -#. +#. #. #. @@ -26092,5 +26052,5 @@ #. 50000 #. -#. +#. #. #. @@ -26099,5 +26059,5 @@ #. 50000 #. -#. +#. #. #. @@ -26107,5 +26067,5 @@ #. 50000 #. -#. +#. #. #. @@ -26115,5 +26075,5 @@ #. 50000 #. -#. +#. #. #. @@ -26123,5 +26083,5 @@ #. 50000 #. -#. +#. #. #. @@ -26131,5 +26091,5 @@ #. 50000 #. -#. +#. #. #. @@ -26139,5 +26099,5 @@ #. 50000 #. -#. +#. #. #. @@ -26147,5 +26107,5 @@ #. 50000 #. -#. +#. #. #. @@ -26155,5 +26115,5 @@ #. 50000 #. -#. +#. #. #. @@ -26163,5 +26123,5 @@ #. 50000 #. -#. +#. #. #. @@ -26171,5 +26131,5 @@ #. 50000 #. -#. +#. #. #. @@ -26180,5 +26140,5 @@ #. 50000 #. -#. +#. #. #. @@ -26188,5 +26148,5 @@ #. 50000 #. -#. +#. #. #. @@ -26196,5 +26156,5 @@ #. 50000 #. -#. +#. #. #. @@ -26204,5 +26164,5 @@ #. 50000 #. -#. +#. #. #. @@ -26212,5 +26172,5 @@ #. 50000 #. -#. +#. #. #. @@ -26220,5 +26180,5 @@ #. 50000 #. -#. +#. #. #. @@ -26228,5 +26188,5 @@ #. 50000 #. -#. +#. #. #. @@ -26236,5 +26196,5 @@ #. 50000 #. -#. +#. #. #. @@ -26244,5 +26204,5 @@ #. 50000 #. -#. +#. #. #. @@ -26252,5 +26212,5 @@ #. 50000 #. -#. +#. #. #. @@ -26260,5 +26220,5 @@ #. 50000 #. -#. +#. #. #. @@ -26268,5 +26228,5 @@ #. 50000 #. -#. +#. #. #. @@ -26276,5 +26236,5 @@ #. 50000 #. -#. +#. #. #. @@ -26284,5 +26244,5 @@ #. 50000 #. -#. +#. #. #. @@ -26292,5 +26252,5 @@ #. 50000 #. -#. +#. #. #. @@ -26300,5 +26260,5 @@ #. 50000 #. -#. +#. #. #. @@ -26308,5 +26268,5 @@ #. 50000 #. -#. +#. #. #. @@ -26316,5 +26276,5 @@ #. 50000 #. -#. +#. #. #. @@ -26324,5 +26284,5 @@ #. 50000 #. -#. +#. #. #. @@ -26331,5 +26291,5 @@ #. 50000 #. -#. +#. #. #. @@ -26361,5 +26321,5 @@ #. 50000 #. -#. +#. #. #. @@ -26369,5 +26329,5 @@ #. 50000 #. -#. +#. #. #. @@ -26377,7 +26337,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26392,5 +26352,5 @@ #. 50000 #. -#. +#. #. #. @@ -26400,5 +26360,5 @@ #. 50000 #. -#. +#. #. #. @@ -26408,5 +26368,5 @@ #. 50000 #. -#. +#. #. #. @@ -26416,5 +26376,5 @@ #. 50000 #. -#. +#. #. #. @@ -26424,5 +26384,5 @@ #. 50000 #. -#. +#. #. #. @@ -26432,5 +26392,5 @@ #. 50000 #. -#. +#. #. #. @@ -26440,5 +26400,5 @@ #. 50000 #. -#. +#. #. #. @@ -26454,7 +26414,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -26464,5 +26424,5 @@ #. 50000 #. -#. +#. #. #. @@ -26472,5 +26432,5 @@ #. 50000 #. -#. +#. #. #. @@ -26480,5 +26440,5 @@ #. 50000 #. -#. +#. #. #. @@ -26488,5 +26448,5 @@ #. 50000 #. -#. +#. #. #. @@ -26496,5 +26456,5 @@ #. 50000 #. -#. +#. #. #. @@ -26504,5 +26464,5 @@ #. 50000 #. -#. +#. #. #. @@ -26512,5 +26472,5 @@ #. 50000 #. -#. +#. #. #. @@ -26520,5 +26480,5 @@ #. 50000 #. -#. +#. #. #. @@ -26528,5 +26488,5 @@ #. 50000 #. -#. +#. #. #. @@ -26536,5 +26496,5 @@ #. 50000 #. -#. +#. #. #. @@ -26544,5 +26504,5 @@ #. 50000 #. -#. +#. #. #. @@ -26552,5 +26512,5 @@ #. 50000 #. -#. +#. #. #. @@ -26560,5 +26520,5 @@ #. 50000 #. -#. +#. #. #. @@ -26568,5 +26528,5 @@ #. 50000 #. -#. +#. #. #. @@ -26576,5 +26536,5 @@ #. 50000 #. -#. +#. #. #. @@ -26584,5 +26544,5 @@ #. 50000 #. -#. +#. #. #. @@ -26592,5 +26552,5 @@ #. 50000 #. -#. +#. #. #. @@ -26600,5 +26560,5 @@ #. 50000 #. -#. +#. #. #. @@ -26608,5 +26568,5 @@ #. 50000 #. -#. +#. #. #. @@ -26616,5 +26576,5 @@ #. 50000 #. -#. +#. #. #. @@ -26624,5 +26584,5 @@ #. 50000 #. -#. +#. #. #. @@ -26632,5 +26592,5 @@ #. 50000 #. -#. +#. #. #. @@ -26640,5 +26600,5 @@ #. 50000 #. -#. +#. #. #. @@ -26648,5 +26608,5 @@ #. 50000 #. -#. +#. #. #. @@ -26656,5 +26616,5 @@ #. 50000 #. -#. +#. #. #. @@ -26664,5 +26624,5 @@ #. 50000 #. -#. +#. #. #. @@ -26672,5 +26632,5 @@ #. 50000 #. -#. +#. #. #. @@ -26680,5 +26640,5 @@ #. 50000 #. -#. +#. #. #. @@ -26688,5 +26648,5 @@ #. 50000 #. -#. +#. #. #. @@ -26696,5 +26656,5 @@ #. 50000 #. -#. +#. #. #. @@ -26704,5 +26664,5 @@ #. 50000 #. -#. +#. #. #. @@ -26712,5 +26672,5 @@ #. 50000 #. -#. +#. #. #. @@ -26720,5 +26680,5 @@ #. 50000 #. -#. +#. #. #. @@ -26728,5 +26688,5 @@ #. 50000 #. -#. +#. #. #. @@ -26736,5 +26696,5 @@ #. 50000 #. -#. +#. #. #. @@ -26744,5 +26704,5 @@ #. 50000 #. -#. +#. #. #. @@ -26752,5 +26712,5 @@ #. 50000 #. -#. +#. #. #. @@ -26760,5 +26720,5 @@ #. 50000 #. -#. +#. #. #. @@ -26768,5 +26728,5 @@ #. 50000 #. -#. +#. #. #. @@ -26776,5 +26736,5 @@ #. 50000 #. -#. +#. #. #. @@ -26784,5 +26744,5 @@ #. 50000 #. -#. +#. #. #. @@ -26792,5 +26752,5 @@ #. 50000 #. -#. +#. #. #. @@ -26826,7 +26786,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26836,5 +26796,5 @@ #. 50000 #. -#. +#. #. #. @@ -26844,5 +26804,5 @@ #. 50000 #. -#. +#. #. #. @@ -26852,5 +26812,5 @@ #. 50000 #. -#. +#. #. #. @@ -26860,5 +26820,5 @@ #. 50000 #. -#. +#. #. #. @@ -26868,5 +26828,5 @@ #. 50000 #. -#. +#. #. #. @@ -26876,5 +26836,5 @@ #. 50000 #. -#. +#. #. #. @@ -26884,5 +26844,5 @@ #. 50000 #. -#. +#. #. #. @@ -26899,5 +26859,5 @@ #. 50000 #. -#. +#. #. #. @@ -26907,5 +26867,5 @@ #. 50000 #. -#. +#. #. #. @@ -26915,5 +26875,5 @@ #. 50000 #. -#. +#. #. #. @@ -26923,5 +26883,5 @@ #. 50000 #. -#. +#. #. #. @@ -26931,5 +26891,5 @@ #. 50000 #. -#. +#. #. #. @@ -26939,5 +26899,5 @@ #. 50000 #. -#. +#. #. #. @@ -26948,5 +26908,5 @@ #. 50000 #. -#. +#. #. #. @@ -26956,5 +26916,5 @@ #. 50000 #. -#. +#. #. #. @@ -26964,5 +26924,5 @@ #. 40000 #. -#. +#. #. #. @@ -26972,5 +26932,5 @@ #. 50000 #. -#. +#. #. #. @@ -26979,5 +26939,5 @@ #. 40000 #. -#. +#. #. #. @@ -26986,5 +26946,5 @@ #. 40000 #. -#. +#. #. #. @@ -27002,7 +26962,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27012,5 +26972,5 @@ #. 50000 #. -#. +#. #. #. @@ -27020,5 +26980,5 @@ #. 50000 #. -#. +#. #. #. @@ -27028,5 +26988,5 @@ #. 50000 #. -#. +#. #. #. @@ -27036,5 +26996,5 @@ #. 50000 #. -#. +#. #. #. @@ -27044,5 +27004,5 @@ #. 50000 #. -#. +#. #. #. @@ -27052,5 +27012,5 @@ #. 50000 #. -#. +#. #. #. @@ -27060,5 +27020,5 @@ #. 50000 #. -#. +#. #. #. @@ -27068,5 +27028,5 @@ #. 50000 #. -#. +#. #. #. @@ -27076,5 +27036,5 @@ #. 50000 #. -#. +#. #. #. @@ -27093,5 +27053,5 @@ #. 50000 #. -#. +#. #. #. @@ -27105,5 +27065,5 @@ #. 50000 #. -#. +#. #. #. @@ -27117,5 +27077,5 @@ #. 50000 #. -#. +#. #. #. @@ -27125,5 +27085,5 @@ #. 50000 #. -#. +#. #. #. @@ -27137,5 +27097,5 @@ #. 50000 #. -#. +#. #. #. @@ -27149,5 +27109,5 @@ #. 50000 #. -#. +#. #. #. @@ -27161,6 +27121,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -27170,5 +27130,5 @@ #. 50000 #. -#. +#. #. #. @@ -27182,5 +27142,5 @@ #. 50000 #. -#. +#. #. #. @@ -27194,5 +27154,5 @@ #. 50000 #. -#. +#. #. #. @@ -27206,5 +27166,5 @@ #. 50000 #. -#. +#. #. #. @@ -27218,5 +27178,5 @@ #. 50000 #. -#. +#. #. #. @@ -27230,5 +27190,5 @@ #. 50000 #. -#. +#. #. #. @@ -27238,7 +27198,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27248,5 +27208,5 @@ #. 50000 #. -#. +#. #. #. @@ -27256,5 +27216,5 @@ #. 50000 #. -#. +#. #. #. @@ -27264,5 +27224,5 @@ #. 50000 #. -#. +#. #. #. @@ -27272,5 +27232,5 @@ #. 50000 #. -#. +#. #. #. @@ -27287,5 +27247,5 @@ #. 50000 #. -#. +#. #. #. @@ -27298,5 +27258,5 @@ #. 50000 #. -#. +#. #. #. @@ -27310,5 +27270,5 @@ #. 50000 #. -#. +#. #. #. @@ -27322,5 +27282,5 @@ #. 50000 #. -#. +#. #. #. @@ -27334,5 +27294,5 @@ #. 50000 #. -#. +#. #. #. @@ -27343,5 +27303,5 @@ #. 50000 #. -#. +#. #. #. @@ -27351,5 +27311,5 @@ #. 50000 #. -#. +#. #. #. @@ -27359,5 +27319,5 @@ #. 50000 #. -#. +#. #. #. @@ -27367,5 +27327,5 @@ #. 50000 #. -#. +#. #. #. @@ -27375,5 +27335,5 @@ #. 50000 #. -#. +#. #. #. @@ -27390,5 +27350,5 @@ #. 50000 #. -#. +#. #. #. @@ -27402,5 +27362,5 @@ #. 50000 #. -#. +#. #. #. @@ -27414,5 +27374,5 @@ #. 50000 #. -#. +#. #. #. @@ -27426,5 +27386,5 @@ #. 50000 #. -#. +#. #. #. @@ -27438,5 +27398,5 @@ #. 50000 #. -#. +#. #. #. @@ -27450,5 +27410,5 @@ #. 50000 #. -#. +#. #. #. @@ -27457,7 +27417,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27467,5 +27427,5 @@ #. 50000 #. -#. +#. #. #. @@ -27475,5 +27435,5 @@ #. 50000 #. -#. +#. #. #. @@ -27483,5 +27443,5 @@ #. 50000 #. -#. +#. #. #. @@ -27491,5 +27451,5 @@ #. 50000 #. -#. +#. #. #. @@ -27499,5 +27459,5 @@ #. 50000 #. -#. +#. #. #. @@ -27507,5 +27467,5 @@ #. 50000 #. -#. +#. #. #. @@ -27515,5 +27475,5 @@ #. 50000 #. -#. +#. #. #. @@ -27530,7 +27490,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27540,5 +27500,5 @@ #. 50000 #. -#. +#. #. #. @@ -27548,5 +27508,5 @@ #. 50000 #. -#. +#. #. #. @@ -27556,5 +27516,5 @@ #. 50000 #. -#. +#. #. #. @@ -27564,5 +27524,5 @@ #. 50000 #. -#. +#. #. #. @@ -27578,5 +27538,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -27625,5 +27585,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27633,5 +27593,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27641,5 +27601,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27649,5 +27609,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27657,5 +27617,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27665,5 +27625,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27673,5 +27633,5 @@ #. 50000 #. -#. +#. #. #. @@ -27681,5 +27641,5 @@ #. 50000 #. -#. +#. #. #. @@ -27689,5 +27649,5 @@ #. 50000 #. -#. +#. #. #. @@ -27697,5 +27657,5 @@ #. 50000 #. -#. +#. #. #. @@ -27705,5 +27665,5 @@ #. 50000 #. -#. +#. #. #. @@ -27713,5 +27673,5 @@ #. 50000 #. -#. +#. #. #. @@ -27731,5 +27691,5 @@ #. 50000 #. -#. +#. #. #. @@ -27738,5 +27698,5 @@ #. 50000 #. -#. +#. #. #. @@ -27745,5 +27705,5 @@ #. 50000 #. -#. +#. #. #. @@ -27752,5 +27712,5 @@ #. 40000 #. -#. +#. #. #. @@ -27759,5 +27719,5 @@ #. 40000 #. -#. +#. #. #. @@ -27766,5 +27726,5 @@ #. 40000 #. -#. +#. #. #. @@ -27859,5 +27819,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -27865,28 +27825,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 @@ -28001,5 +27961,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -28012,5 +27972,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -28035,6 +27995,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -28043,6 +28003,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -28057,6 +28017,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 @@ -28070,6 +28030,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 @@ -28089,6 +28049,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -28112,6 +28072,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 @@ -28123,2 +28083,121 @@ msgid "Sicily - Italy" msgstr "Sizilien - Italien" + +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Kommando \"{0}\" kann nicht rückgängig gemacht werden, da die Ebene \"{1}" +#~ "\" nicht mehr existiert." + +#~ msgid "Download all incomplete ways and nodes in relation" +#~ msgstr "" +#~ "Alle nicht vollständigen Wege und Knoten der Relation herunterladen." + +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Zum Hochladen aller Änderungen mit nur einer Anfrage aktivieren. " +#~ "Deaktivieren zur Nutzung eine Anfrage je geändertem Objekt." + +#~ msgid "Images for {0}" +#~ msgstr "Bilder für {0}" + +#~ msgid "Read GPX..." +#~ msgstr "GPX lesen..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Keine Zeit für Punkt {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Zeit \"{0}\" vom Punkt {1} x {2} konnte nicht gelesen werden" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden." + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS Start: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS Ende: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "Aktueller Unterschied: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "Zeitzonen Unterschied: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} innerhalb der GPS-Spur." + +#~ msgid "Sync clock" +#~ msgstr "Uhrzeit synchronisieren" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Das Datum in der Datei \"{0}\" konnte nicht verarbeitet werden." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Keine EXIF-Zeitinformationen in der Datei \\\"{0}\\\" enthalten." + +#~ msgid "Image" +#~ msgstr "Bild" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Angezeigtes Datum eingeben (mm/tt/jjjj HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Zeitzone des GPS-Geräts (Unterschied zum Foto)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Zeit mit GPS-Gerät synchronisieren" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Die eingegebene Zeit konnte nicht eingelesen werden." + +#~ msgid "" +#~ "WARNING: no API version defined for data to upload. Falling back to " +#~ "version 0.6" +#~ msgstr "" +#~ "Achtung: Für die Übertragung ist keine API-Version definiert. Es wird " +#~ "daher Version 0.6 benutzt." + +#~ 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 "" +#~ "Achtung: Voreinstellung \"{0}\" oder API-Version \"{1}\" des Datensatzes " +#~ "benötigen eine Übertragung der Änderungen. Dies wird ignoriert, da die " +#~ "Server-API es nicht versteht." + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "" +#~ "Start des Plugins {0} wurde veranlasst. Dieses Plugin wird nicht mehr " +#~ "benötigt." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Georeferenzierte Bilder" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Bilder mit AgPifoJ öffnen..." + +#~ msgid "osmarender options" +#~ msgstr "Einstellungen für Osmarender" + +#~ msgid "Group common Address Interpolation inputs in a single dialog," +#~ msgstr "Gruppiert bekannte Adressinterpolation in einem Dialogfenster." + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Ein weiteres Georeferenzierungsplugin für JOSM. Es korreliert Bilder mit " +#~ "GPS-Spuren oder importiert mit EXIF georeferenzierte Bilder." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Etliche Werkzeuge, welche einem das Leben vereinfachen. Zum Beispiel Weg " +#~ "vereinfachen, Flächen verbinden, Springe zur Position" Index: /applications/editors/josm/i18n/po/el.po =================================================================== --- /applications/editors/josm/i18n/po/el.po (revision 18974) +++ /applications/editors/josm/i18n/po/el.po (revision 18975) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 16:20+0100\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" "PO-Revision-Date: 2009-11-17 17:54+0000\n" "Last-Translator: alichani \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:05+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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" @@ -116,5 +115,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 @@ -137,9 +136,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 @@ -155,20 +154,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 @@ -187,7 +182,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 "Σφάλμα" @@ -267,5 +262,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 "Πρόσθετα" @@ -306,4 +301,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 @@ -311,8 +308,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 @@ -322,29 +319,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 @@ -373,6 +368,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 "" @@ -424,14 +419,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 "Γεωγραφικό μήκος" @@ -457,10 +452,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 @@ -491,19 +486,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 @@ -512,9 +510,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 @@ -530,7 +525,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 @@ -542,11 +537,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" @@ -634,5 +629,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}" @@ -683,10 +678,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 "" @@ -705,19 +700,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 " @@ -728,9 +723,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 @@ -803,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" @@ -825,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 @@ -853,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 "Αντιγραφή" @@ -908,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 @@ -917,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 @@ -928,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 @@ -948,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 @@ -972,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 @@ -1018,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 @@ -1035,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 "URL" + +#: ../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" @@ -1043,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 "" @@ -1070,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" @@ -1439,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 "" "Εμφάνιση αναφοράς κατάστασης με χρήσιμες πληροφορίες οι οποίες μπορούν να " @@ -1460,9 +1594,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 @@ -1589,6 +1755,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 "" @@ -1666,54 +1831,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 "" @@ -1722,35 +1887,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 "" @@ -1758,28 +1923,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 "" @@ -1789,22 +1952,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 "" @@ -1815,15 +1978,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 "" @@ -1835,6 +1998,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 "" @@ -1843,38 +2006,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 "Αποστολή όλων των αλλαγών της τρέχουσας επιλογής στον διακομιστή OSM" -#: ../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 "" @@ -2038,6 +2200,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 "" @@ -2104,38 +2266,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." @@ -2144,14 +2306,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 "Τέλος σχεδιασμού." @@ -2188,6 +2350,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 "" @@ -2274,6 +2436,6 @@ "move zoom with right button" msgstr "" -"Κάντε ζουμ σέρνοντας ή πατώντας Ctrl+. ή Ctrl+, μετακινήστε πατώντας " -"Ctrl+πάνω, κάτω, αριστερά, δεξιά ή με το δεξί πλήκτρο του ποντικιού" +"Κάντε ζουμ σέρνοντας ή πατώντας Ctrl+. ή Ctrl+, μετακινήστε πατώντας Ctrl" +"+πάνω, κάτω, αριστερά, δεξιά ή με το δεξί πλήκτρο του ποντικιού" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 @@ -2288,5 +2450,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." @@ -2371,12 +2533,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - όλα τα αντικείμενα που αλλάχθηκαν από τον χρήστη" + +#: ../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-" @@ -2384,43 +2551,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 "modified - όλα τα αλλαγμένα αντικείμενα" -#: ../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 "selected - όλα τα επιλεγμένα αντικείμενα" -#: ../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 "incomplete - όλα τα ημιτελή αντικείμενα" -#: ../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 "untagged - όλα τα αντικείμενα χωρίς ετικέτες" -#: ../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 @@ -2430,55 +2597,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 "Τίποτα δεν προστέθηκε στην επιλογή ψάχνοντας για \"{0}\"" -#: ../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 "Τίποτα δεν αφαιρέθηκε από την επιλογή ψάχνοντας για \"{0}\"" -#: ../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 "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2488,40 +2655,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 "" @@ -2530,9 +2697,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 "" @@ -2541,5 +2708,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." @@ -2592,6 +2759,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 "" @@ -2599,5 +2765,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 "" @@ -2733,5 +2899,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 "" @@ -2750,5 +2916,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 "" @@ -2767,19 +2934,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" @@ -2788,5 +2955,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" @@ -2795,5 +2962,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" @@ -2802,5 +2969,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" @@ -2811,10 +2978,10 @@ #. 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?" +#: ../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 "" "Πρόκειτε να διαγράψετε κόμβους εκτός της περιοχής που λάβατε.
Αυτό " @@ -2822,5 +2989,5 @@ "μπορεί να τους χρησιμοποιούν.
Είστε σίγουροι οτι επιθυμείτε διαγραφή;" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "" @@ -2838,15 +3005,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 "" @@ -2855,5 +3022,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}" @@ -2863,9 +3030,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 "" @@ -2945,5 +3107,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 " @@ -3086,6 +3248,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 "" @@ -3168,5 +3330,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3175,5 +3337,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3181,25 +3343,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 @@ -3222,25 +3384,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}" @@ -3248,6 +3411,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 "" @@ -3310,24 +3473,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 " @@ -3335,5 +3498,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 "" @@ -3365,6 +3528,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}." @@ -3385,5 +3548,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 @@ -3395,6 +3557,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 "" @@ -3405,135 +3566,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 "" -#: ../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 "" -#: ../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}" @@ -3545,5 +3706,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 @@ -3562,5 +3723,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 @@ -3580,5 +3741,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 "φόντο" @@ -3696,6 +3857,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 "" @@ -3710,5 +3870,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 @@ -3716,32 +3876,32 @@ msgstr "" -#: ../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" @@ -3750,5 +3910,5 @@ msgstr[1] "{0} κόμβοι" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -3995,12 +4155,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 @@ -4014,19 +4174,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 @@ -4037,5 +4197,5 @@ msgstr "Μενού: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Ήχος" @@ -4079,29 +4239,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 " @@ -4109,9 +4269,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 "" @@ -4217,5 +4377,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" @@ -4224,5 +4384,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" @@ -4231,5 +4391,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" @@ -4248,5 +4408,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 @@ -4263,5 +4423,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" @@ -4333,22 +4493,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." @@ -4429,6 +4589,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 "" @@ -4498,6 +4657,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" @@ -4505,6 +4664,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" @@ -4561,6 +4720,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 "" @@ -4593,7 +4752,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 "" @@ -4739,5 +4898,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 "" @@ -4872,5 +5031,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 "" @@ -4970,7 +5129,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" @@ -4980,6 +5139,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" @@ -5013,7 +5172,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 "" @@ -5102,5 +5259,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 @@ -5167,10 +5324,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 "" @@ -5245,18 +5401,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 @@ -5266,13 +5422,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 "" @@ -5433,6 +5589,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" -msgstr "" -"Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα" +msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα" #. item "Land use/Quarry" text "Name" @@ -5467,5 +5622,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 "" @@ -5508,25 +5663,25 @@ 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} / WaysQ{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." @@ -5535,5 +5690,5 @@ "αριστερή εργαλειοθήκη." -#: ../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 "" @@ -5594,37 +5749,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 "" @@ -5633,63 +5788,91 @@ 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 +#, java-format +msgid "Downloading {0} incomplete child of relation ''{1}''" +msgid_plural "Downloading {0} incomplete children of relation ''{1}''" +msgstr[0] "" +msgstr[1] "" + +#: ../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 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "({0}/{1}) Φόρτωση γονέων σχέσης {2}" + +#: ../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 "" @@ -5699,15 +5882,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 " @@ -5715,5 +5898,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 " @@ -5721,20 +5904,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 "" @@ -5743,66 +5926,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 " @@ -5811,53 +5998,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" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../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: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 "" @@ -5867,41 +6060,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 "" @@ -5941,19 +6127,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}''" @@ -5965,6 +6151,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 "" @@ -6147,7 +6332,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 "" @@ -6920,5 +7104,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 @@ -7155,6 +7339,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 "" @@ -7164,6 +7348,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 "" @@ -7426,13 +7610,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}" @@ -7533,6 +7717,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 "" "Το επίπεδο \"{0}\" έχει αλλαγές που πρέπει να αποσταλλούν στον διακομιστή." @@ -7618,6 +7801,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] "" @@ -7631,6 +7814,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 " @@ -7687,5 +7870,5 @@ msgstr "Προετοιμασία επιπέδου \"{0}\" για αποστολή ..." -#: ../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 " @@ -7693,5 +7876,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 "" @@ -7764,40 +7947,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:" @@ -7806,5 +7989,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:" @@ -7813,5 +7996,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:" @@ -7820,68 +8003,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 +#: ../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}" @@ -7889,16 +8071,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}." @@ -7906,6 +8088,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 "" @@ -7914,5 +8096,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 "" @@ -7942,111 +8124,55 @@ 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 "Αρχή GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "Τέλος GPS: {0}" - -#: ../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] "εικόνες" - -#: ../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 "Εικόνες JPEG (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "Η ημερομηνία στο αρχείο \"{0}\" δεν μπόρεσε να ερμηνευθεί." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "Δεν υπάρχει ώρα EXIF μέσα στο αρχείο \"{0}\"." - -#: ../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 "ζώνη ώρας της συσκευής GPS (διαφορά από την φωτογραφία)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Συγχρονισμός Ώρας με τη μονάδα GPS" - -#: ../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} μέτρα" + +#: ../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 @@ -8054,30 +8180,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 @@ -8085,5 +8211,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 @@ -8092,5 +8218,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 @@ -8099,58 +8225,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 "Εικόνες JPEG (*.jpg)" + +#: ../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 @@ -8158,5 +8289,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" @@ -8166,5 +8297,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 @@ -8172,22 +8303,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 "URL" - -#: ../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, " @@ -8196,5 +8322,5 @@ msgstr[1] "{0} διαδρομές, " -#: ../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" @@ -8203,24 +8329,24 @@ msgstr[1] "{0} σημεία αναφοράς" -#: ../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:" +#: ../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 "" "Η αποστολή μη επεξεργασμένων δεδομένων GPS ως δεδομένα χάρτη θερείτε " "βλαβερή.
Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8230,29 +8356,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 "Λήψη από OSM κατά μηκός αυτού του ίχνους" -#: ../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 "" @@ -8263,10 +8389,10 @@ "συνεχίσετε;" -#: ../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 "" "Δεν υπάρχει διαθέσιμο ίχνος GPX στο επίπεδο για την συσχέτιση με τον ήχο." -#: ../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 " @@ -8274,5 +8400,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 " @@ -8280,23 +8406,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 "έκδοση {0}" -#: ../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." @@ -8305,5 +8431,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 "" @@ -8317,5 +8443,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 "" @@ -8328,11 +8454,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" @@ -8341,32 +8467,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 "Έκδοση API: {0}" -#: ../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 "Μετατροπή σε επίπεδο GPX" -#: ../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 "" @@ -8374,6 +8500,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 "" @@ -8412,4 +8538,349 @@ msgstr[1] "{0} σημεία" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "Αρχεία GPX (*.gpx *.gpx.gz)" + +#: ../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 "Ώρα φωτογραφίας (από exif):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "Ώρα Gps (διαβάστε από την παραπάνω φωτογραφία): " + +#: ../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 "Συγχρονισμός ώρας από φωτογραφία του δέκτη GPS" + +#: ../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 "Ίχνος GPX: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Άνοιγμα άλλου ίχνους GPX" + +#: ../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 "" +"Μπορώ να βγάλω φωτογραφία τον δέκτη GPS μου.
Μπορεί αυτό να " +"βοηθήσει;" + +#: ../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 "Εικόνες χωρίς θέση exif" + +#: ../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 "Πρέπει να επιλέξετε ένα ίχνος GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "Δεν επιλέχθηκε ίχνος GPX" + +#: ../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 "Τ οίχνος GPX δεν περιέχει πληροφορίες ώρας" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "Ζώνη ώρας: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "Λεπτά: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "Δευτερόλεπτα: {0}" + +#: ../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 "(Διαφορά ώρας {0} ημερών)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "Απόκλειση ανάμεσα σε ίχνος και φωτογραφίες: {0}λ {1}δ" + +#: ../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 "Εξαγωγή τοποθεσιών GPS από EXIF" + +#: ../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 "Σάρωση καταλόγου {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "Βρέθηκε μηδενικό αρχείο στον κατάλογο {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\n" + +#: ../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] "εικόνες" + +#: ../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 "Φόρτωση {0}" + +#: ../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 "Σφάλμα στο αρχείο {0}" + +#: ../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 "" +"\n" +"Υψόμετρο: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} χμ/ω" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8715,5 +9186,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 @@ -8907,6 +9378,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 "" @@ -8965,6 +9435,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 "" "Εφαρμογή antialiasing σετην προβολή χάρτη με αποτέλεσμα ομαλότερη απεικόνηση." @@ -9034,19 +9503,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 @@ -9149,6 +9618,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108 msgid "You have to restart JOSM for some settings to take effect." -msgstr "" -"Πρέπει να επανεκινήσετε το JOSM για να εφαρμοστούν κάποιες ρυθμίσεις." +msgstr "Πρέπει να επανεκινήσετε το JOSM για να εφαρμοστούν κάποιες ρυθμίσεις." #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 @@ -9307,6 +9775,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 "" @@ -9372,6 +9840,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 "" @@ -9384,9 +9852,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 "" @@ -9410,6 +9877,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 "" @@ -9502,5 +9969,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 "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό" @@ -9587,5 +10054,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 @@ -9593,5 +10060,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9713,14 +10180,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 @@ -9748,24 +10214,31 @@ 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}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9807,27 +10280,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 "" @@ -9835,66 +10308,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 "Με επιτυχία άνοιξε το changeset {0}" -#: ../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}." @@ -9929,5 +10402,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}''." @@ -9954,5 +10427,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}." @@ -9960,5 +10433,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}" @@ -9971,5 +10444,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}''." @@ -10029,7 +10502,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 "" @@ -10057,6 +10530,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 "" @@ -10122,46 +10595,45 @@ msgstr "Το αρχείο \"{0}\" δεν υπάρχει" -#: ../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 "" @@ -10169,19 +10641,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 "" @@ -10191,8 +10663,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 "" @@ -10202,25 +10674,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 "" @@ -10228,5 +10700,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10235,5 +10707,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10241,5 +10713,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10248,13 +10720,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 "Προετοιμασία δεδομένων OSM..." -#: ../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 "" @@ -10307,4 +10779,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 @@ -10344,42 +10822,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 "" @@ -10421,17 +10900,27 @@ msgstr "Λήψη πρόσθετου {0}..." -#: ../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 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Σφάλμα κατά την διαγραφή του αρχείου πρόσθετου: {0}" + +#: ../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}." @@ -10443,19 +10932,18 @@ msgstr "Συνέβη σφάλμα στο πρόσθετο {0}" -#: ../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" @@ -10464,35 +10952,34 @@ 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 "Τελευταία ενημέρωση πρόσθετου παραπάνω από {0} μέρες πριν." -#: ../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 "" -"Το πρόσθετο {0} είναι απαραίτητο από το πρόσθετο {1} αλλά δεν βρέθηκε." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181 +msgstr "Το πρόσθετο {0} είναι απαραίτητο από το πρόσθετο {1} αλλά δεν βρέθηκε." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182 #, java-format msgid "Plugin not found: {0}." msgstr "Δεν βρέθηκε το πρόσθετο: {0}." -#: ../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?" @@ -10500,16 +10987,16 @@ "Δεν ήταν δυνατή η φόρτωση του πρόσθετου {0}. Διαγραφή από τις προτιμήσεις;" -#: ../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 " @@ -10519,9 +11006,9 @@ "άδεια αντικατάστασης των υπαρχόντων." -#: ../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 "" @@ -10531,10 +11018,10 @@ "''{0}''." -#: ../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 "Σώμφωνα με τις πληροφορίες του πρόσθετου, ο συγγραφέας είναι{0}." -#: ../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." @@ -10543,9 +11030,9 @@ "κάντε αναφορά για bug." -#: ../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 " @@ -10555,13 +11042,13 @@ "να αποφορτωθεί το πρόσθετο." -#: ../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" @@ -10681,6 +11168,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 "" @@ -10718,6 +11205,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 "" @@ -10779,7 +11266,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 "" @@ -10791,7 +11277,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 "" @@ -10823,6 +11309,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 "" @@ -10874,6 +11360,6 @@ "\n" msgstr "" -"Η ρύθμιση της συντόμευσης πληκτρολογίου ''{0}'' για την ενέργεια ''{1}'' " -"({2}) απέτυχε\n" +"Η ρύθμιση της συντόμευσης πληκτρολογίου ''{0}'' για την ενέργεια " +"''{1}'' ({2}) απέτυχε\n" "γιατί η συντόμευση είναι ήδη πιασμένη από την ενέργεια ''{3}'' ({4}).\n" "\n" @@ -11081,5 +11567,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" @@ -11094,12 +11580,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 @@ -11107,447 +11591,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 +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 "" -"\n" -"Υψόμετρο: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} χμ/ω" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "Εξαγωγή τοποθεσιών GPS από EXIF" - -#: ../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 "Σάρωση καταλόγου {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "Βρέθηκε μηδενικό αρχείο στον κατάλογο {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\n" - -#: ../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 "Άνοιγμα εικόνων με το AgPifoJ..." - -#: ../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 "Αρχεία GPX (*.gpx *.gpx.gz)" - -#: ../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 "Ώρα φωτογραφίας (από exif):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "Ώρα Gps (διαβάστε από την παραπάνω φωτογραφία): " - -#: ../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 "Συγχρονισμός ώρας από φωτογραφία του δέκτη GPS" - -#: ../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 "Ίχνος GPX: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Άνοιγμα άλλου ίχνους GPX" - -#: ../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 "" -"Μπορώ να βγάλω φωτογραφία τον δέκτη GPS μου.
Μπορεί αυτό να " -"βοηθήσει;" - -#: ../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 "Εικόνες χωρίς θέση exif" - -#: ../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 "Πρέπει να επιλέξετε ένα ίχνος GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Δεν επιλέχθηκε ίχνος GPX" - -#: ../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 "Τ οίχνος GPX δεν περιέχει πληροφορίες ώρας" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Ζώνη ώρας: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Λεπτά: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Δευτερόλεπτα: {0}" - -#: ../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 "(Διαφορά ώρας {0} ημερών)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Απόκλειση ανάμεσα σε ίχνος και φωτογραφίες: {0}λ {1}δ" - -#: ../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 "Φόρτωση {0}" - -#: ../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 "Σφάλμα στο αρχείο {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11691,11 +11871,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 "" @@ -12006,12 +12185,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 @@ -12125,14 +12296,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 " @@ -12440,4 +12611,8 @@ msgstr "Άνοιγμα εικόνων με το ImageWayPoint" +#: ../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" @@ -12481,18 +12656,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" @@ -12541,7 +12716,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12551,5 +12726,5 @@ #. 50000 #. -#. +#. #. #. @@ -12559,5 +12734,5 @@ #. 50000 #. -#. +#. #. #. @@ -12566,5 +12741,5 @@ #. 50000 #. -#. +#. #. #. @@ -12574,5 +12749,5 @@ #. 50000 #. -#. +#. #. #. @@ -12650,6 +12825,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 "" @@ -12668,10 +12842,9 @@ #: ../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." -msgstr "" -"Ακρίβεια απλοποίησης γραμμών Douglas-Peucker , μετρημένη σε " -"μοίρες.
Χαμηλότερες τιμές δίνουν περισσότερους κόμβους, και ποιό ακριβείς " +"Accuracy of Douglas-Peucker line simplification, measured in degrees." +"
Lower values give more nodes, and more accurate lines. Default 0.0003." +msgstr "" +"Ακρίβεια απλοποίησης γραμμών Douglas-Peucker , μετρημένη σε μοίρες." +"
Χαμηλότερες τιμές δίνουν περισσότερους κόμβους, και ποιό ακριβείς " "γραμμές. Default 0.0003." @@ -12691,6 +12864,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75 msgid "Offset all points in East direction (degrees). Default 0." -msgstr "" -"Μετατόπιση όλων των σημείων Ανατολικά (μοίρες). Προκαθορισμένη τιμή 0." +msgstr "Μετατόπιση όλων των σημείων Ανατολικά (μοίρες). Προκαθορισμένη τιμή 0." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76 @@ -12739,20 +12911,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 "Η σύνδεση απέτυχε" @@ -12971,6 +13142,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 "" "Η κεφαλίδα περιέχει πολλαπλές τιμές και δεν μπορεί να αντιστοιχηθεί σε ένα " @@ -13055,9 +13225,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 "Osmarender" -#: ../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 " @@ -13067,9 +13238,5 @@ "σελίδα Ρυθμίσεις Χάρτη από τις επιλογές." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "επιλογές osmarender" - -#: ../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 "εκτελέσιμο Firefox" @@ -13442,17 +13609,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 "" @@ -13496,160 +13663,4 @@ msgid "Optional" 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 @@ -13692,6 +13703,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77 msgid "Use the error layer to display problematic elements." -msgstr "" -"Χρήση του επιπέδου σφαλμάτων για την προβολή προβληματικών στοιχείων." +msgstr "Χρήση του επιπέδου σφαλμάτων για την προβολή προβληματικών στοιχείων." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80 @@ -13748,5 +13758,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}" @@ -13799,34 +13809,34 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../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:197 +#: ../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:197 +#: ../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 "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 "" @@ -13875,18 +13885,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 "" @@ -14117,7 +14127,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 "" @@ -14260,5 +14269,5 @@ #. 50000 #. -#. +#. #. #. @@ -14266,5 +14275,5 @@ #. #. -#. +#. #. #. @@ -14274,5 +14283,5 @@ #. 50000 #. -#. +#. #. #. @@ -14281,5 +14290,5 @@ #. 50000 #. -#. +#. #. #. @@ -14288,5 +14297,5 @@ #. 50000 #. -#. +#. #. #. @@ -14295,5 +14304,5 @@ #. 50000 #. -#. +#. #. #. @@ -14302,5 +14311,5 @@ #. 50000 #. -#. +#. #. #. @@ -14309,9 +14318,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14356,5 +14365,5 @@ #. 50000 #. -#. +#. #. #. @@ -14487,14 +14496,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 " @@ -14503,14 +14512,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 "" @@ -14519,5 +14528,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 "" @@ -14529,13 +14538,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." @@ -14690,50 +14699,50 @@ "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση" -#: ../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 "Αποθ'ηκευση επιπέδου WMS σε αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "Αποθήκευση επιπέδου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "Φόρτωση επιπέδου WMS από αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "Φόρτωση επιπέδου WMS" -#: ../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 "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}" -#: ../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 "" @@ -14811,5 +14820,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 "" @@ -14845,26 +14854,20 @@ #: build/specialmessages.java:11 msgid "You must make your edits public to upload new data" -msgstr "" -"Πρέπει να κάνετε τις αλλαγές σας δημόσιες για να στείλετε νέα δεδομένα" +msgstr "Πρέπει να κάνετε τις αλλαγές σας δημόσιες για να στείλετε νέα δεδομένα" #. 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 " @@ -14876,21 +14879,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 -#: build/trans_plugins.java:15 msgid "Allows to import various file formats into JOSM directly." msgstr "Επιτρέπει την εισαγωγή διαφόρων τύπων αρχείων απ' ευθείας στο JOSM." #. Plugin DirectUpload -#: build/trans_plugins.java:17 +#: build/trans_plugins.java:15 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " @@ -14899,10 +14902,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 " @@ -14911,21 +14914,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 " @@ -14935,16 +14937,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 " @@ -14954,10 +14956,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 " @@ -14966,5 +14968,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 " @@ -14974,27 +14976,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 -#: build/trans_plugins.java:45 msgid "Imports issues from OpenStreetBugs" msgstr "Εισάγει προβλήματα από OpenStreetBugs" #. Plugin openvisible +#: build/trans_plugins.java:45 +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 " @@ -15003,15 +15005,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 "Επιτρέπει άλλες εφαρμογές να στέλνουν εντολές στο JOSM." #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15020,10 +15022,10 @@ #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:57 msgid "Provides routing capabilities." msgstr "Παρέχει δυνατότητες δρομολόγησης." #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:59 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -15032,15 +15034,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 " @@ -15050,17 +15052,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 " @@ -15069,5 +15064,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15079,10 +15074,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, ...)." @@ -16135,8 +16130,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16333,5 +16328,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16341,5 +16336,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16358,5 +16353,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16366,5 +16361,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16383,5 +16378,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16391,5 +16386,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16408,5 +16403,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16416,5 +16411,5 @@ #. 300000 #. -#. +#. #. #. @@ -16429,5 +16424,5 @@ #. 300000 #. -#. +#. #. #. @@ -16445,5 +16440,5 @@ #. 50000 #. -#. +#. #. #. @@ -16461,5 +16456,5 @@ #. 40000 #. -#. +#. #. #. @@ -16468,5 +16463,5 @@ #. 40000 #. -#. +#. #. #. @@ -16476,5 +16471,5 @@ #. 50000 #. -#. +#. #. #. @@ -16494,5 +16489,5 @@ #. 50000 #. -#. +#. #. #. @@ -16501,5 +16496,5 @@ #. 50000 #. -#. +#. #. #. @@ -16509,5 +16504,5 @@ #. 50000 #. -#. +#. #. #. @@ -16557,7 +16552,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17256,5 +17251,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17293,5 +17288,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17387,5 +17382,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17542,5 +17537,5 @@ #. 50000 #. -#. +#. #. #. @@ -18927,5 +18922,5 @@ #. 30000 #. -#. +#. #. #. @@ -18935,5 +18930,5 @@ #. 40000 #. -#. +#. #. #. @@ -18943,5 +18938,5 @@ #. 20000 #. -#. +#. #. #. @@ -18951,5 +18946,5 @@ #. 40000 #. -#. +#. #. #. @@ -19307,7 +19302,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19317,5 +19312,5 @@ #. 50000 #. -#. +#. #. #. @@ -19325,5 +19320,5 @@ #. 50000 #. -#. +#. #. #. @@ -19333,5 +19328,5 @@ #. 50000 #. -#. +#. #. #. @@ -19341,5 +19336,5 @@ #. 50000 #. -#. +#. #. #. @@ -19349,5 +19344,5 @@ #. 50000 #. -#. +#. #. #. @@ -19357,5 +19352,5 @@ #. 50000 #. -#. +#. #. #. @@ -19365,5 +19360,5 @@ #. 50000 #. -#. +#. #. #. @@ -19373,5 +19368,5 @@ #. 50000 #. -#. +#. #. #. @@ -19381,5 +19376,5 @@ #. 50000 #. -#. +#. #. #. @@ -19389,5 +19384,5 @@ #. 50000 #. -#. +#. #. #. @@ -19397,5 +19392,5 @@ #. 50000 #. -#. +#. #. #. @@ -19405,5 +19400,5 @@ #. 50000 #. -#. +#. #. #. @@ -19413,5 +19408,5 @@ #. 50000 #. -#. +#. #. #. @@ -19421,5 +19416,5 @@ #. 50000 #. -#. +#. #. #. @@ -19429,5 +19424,5 @@ #. 50000 #. -#. +#. #. #. @@ -19437,5 +19432,5 @@ #. 50000 #. -#. +#. #. #. @@ -19445,5 +19440,5 @@ #. 50000 #. -#. +#. #. #. @@ -19453,5 +19448,5 @@ #. 50000 #. -#. +#. #. #. @@ -19461,5 +19456,5 @@ #. 50000 #. -#. +#. #. #. @@ -19469,5 +19464,5 @@ #. 50000 #. -#. +#. #. #. @@ -19477,5 +19472,5 @@ #. 50000 #. -#. +#. #. #. @@ -19485,5 +19480,5 @@ #. 50000 #. -#. +#. #. #. @@ -19493,5 +19488,5 @@ #. 50000 #. -#. +#. #. #. @@ -19501,5 +19496,5 @@ #. 50000 #. -#. +#. #. #. @@ -19509,5 +19504,5 @@ #. 50000 #. -#. +#. #. #. @@ -19517,5 +19512,5 @@ #. 50000 #. -#. +#. #. #. @@ -19525,5 +19520,5 @@ #. 50000 #. -#. +#. #. #. @@ -19533,5 +19528,5 @@ #. 50000 #. -#. +#. #. #. @@ -19541,5 +19536,5 @@ #. 50000 #. -#. +#. #. #. @@ -19549,5 +19544,5 @@ #. 50000 #. -#. +#. #. #. @@ -19557,5 +19552,5 @@ #. 50000 #. -#. +#. #. #. @@ -19565,5 +19560,5 @@ #. 50000 #. -#. +#. #. #. @@ -19573,5 +19568,5 @@ #. 50000 #. -#. +#. #. #. @@ -19581,5 +19576,5 @@ #. 50000 #. -#. +#. #. #. @@ -19589,5 +19584,5 @@ #. 50000 #. -#. +#. #. #. @@ -19597,5 +19592,5 @@ #. 50000 #. -#. +#. #. #. @@ -19605,5 +19600,5 @@ #. 50000 #. -#. +#. #. #. @@ -19613,5 +19608,5 @@ #. 50000 #. -#. +#. #. #. @@ -19621,5 +19616,5 @@ #. 50000 #. -#. +#. #. #. @@ -19629,5 +19624,5 @@ #. 50000 #. -#. +#. #. #. @@ -19637,5 +19632,5 @@ #. 50000 #. -#. +#. #. #. @@ -19645,5 +19640,5 @@ #. 50000 #. -#. +#. #. #. @@ -19653,5 +19648,5 @@ #. 50000 #. -#. +#. #. #. @@ -19661,5 +19656,5 @@ #. 50000 #. -#. +#. #. #. @@ -19669,5 +19664,5 @@ #. 50000 #. -#. +#. #. #. @@ -19677,5 +19672,5 @@ #. 50000 #. -#. +#. #. #. @@ -21369,7 +21364,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21379,5 +21374,5 @@ #. 50000 #. -#. +#. #. #. @@ -21387,5 +21382,5 @@ #. 50000 #. -#. +#. #. #. @@ -21395,5 +21390,5 @@ #. 50000 #. -#. +#. #. #. @@ -21403,5 +21398,5 @@ #. 50000 #. -#. +#. #. #. @@ -21411,5 +21406,5 @@ #. 50000 #. -#. +#. #. #. @@ -21419,5 +21414,5 @@ #. 50000 #. -#. +#. #. #. @@ -21427,5 +21422,5 @@ #. 50000 #. -#. +#. #. #. @@ -22756,5 +22751,5 @@ #. 40000 #. -#. +#. #. #. @@ -22770,5 +22765,5 @@ #. 30000 #. -#. +#. #. #. @@ -22779,7 +22774,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22789,5 +22784,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22797,13 +22800,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22813,5 +22808,5 @@ #. 50000 #. -#. +#. #. #. @@ -22844,5 +22839,5 @@ #. 50000 #. -#. +#. #. #. @@ -22858,5 +22853,5 @@ #. 50000 #. -#. +#. #. #. @@ -22866,5 +22861,5 @@ #. 10000 #. -#. +#. #. #. @@ -22874,5 +22869,5 @@ #. 10000 #. -#. +#. #. #. @@ -22883,5 +22878,5 @@ #. 10000 #. -#. +#. #. #. @@ -22910,5 +22905,5 @@ #. 50000 #. -#. +#. #. #. @@ -23023,9 +23018,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 @@ -23033,5 +23028,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, @@ -23041,8 +23036,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 @@ -23056,5 +23051,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23062,5 +23057,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23109,6 +23104,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23188,5 +23183,5 @@ #. 40000 #. -#. +#. #. #. @@ -23196,5 +23191,5 @@ #. 10000 #. -#. +#. #. #. @@ -23203,5 +23198,5 @@ #. 50000 #. -#. +#. #. #. @@ -23211,5 +23206,5 @@ #. 50000 #. -#. +#. #. #. @@ -23218,5 +23213,5 @@ #. 50000 #. -#. +#. #. #. @@ -23225,5 +23220,5 @@ #. 50000 #. -#. +#. #. #. @@ -23232,5 +23227,5 @@ #. 50000 #. -#. +#. #. #. @@ -23239,5 +23234,5 @@ #. 50000 #. -#. +#. #. #. @@ -23246,5 +23241,5 @@ #. 40000 #. -#. +#. #. #. @@ -23253,5 +23248,5 @@ #. 50000 #. -#. +#. #. #. @@ -23260,5 +23255,5 @@ #. 50000 #. -#. +#. #. #. @@ -23267,5 +23262,5 @@ #. 50000 #. -#. +#. #. #. @@ -23274,5 +23269,5 @@ #. 50000 #. -#. +#. #. #. @@ -23281,5 +23276,5 @@ #. 50000 #. -#. +#. #. #. @@ -23288,5 +23283,5 @@ #. 50000 #. -#. +#. #. #. @@ -23296,5 +23291,5 @@ #. 50000 #. -#. +#. #. #. @@ -23303,5 +23298,5 @@ #. 50000 #. -#. +#. #. #. @@ -23312,5 +23307,5 @@ #. 50000 #. -#. +#. #. #. @@ -23322,11 +23317,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23335,7 +23330,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23346,5 +23341,5 @@ #. 50000 #. -#. +#. #. #. @@ -23355,5 +23350,5 @@ #. 50000 #. -#. +#. #. #. @@ -23364,5 +23359,5 @@ #. 50000 #. -#. +#. #. #. @@ -23373,5 +23368,5 @@ #. 50000 #. -#. +#. #. #. @@ -23382,5 +23377,5 @@ #. 50000 #. -#. +#. #. #. @@ -23391,5 +23386,5 @@ #. 40000 #. -#. +#. #. #. @@ -23401,5 +23396,5 @@ #. 50000 #. -#. +#. #. #. @@ -23410,5 +23405,5 @@ #. 50000 #. -#. +#. #. #. @@ -23433,5 +23428,5 @@ #. 10000 #. -#. +#. #. #. @@ -23440,5 +23435,5 @@ #. 50000 #. -#. +#. #. #. @@ -23447,5 +23442,5 @@ #. 50000 #. -#. +#. #. #. @@ -23461,5 +23456,5 @@ #. 20000 #. -#. +#. #. #. @@ -23473,5 +23468,5 @@ #. 30000 #. -#. +#. #. #. @@ -23480,5 +23475,5 @@ #. 50000 #. -#. +#. #. #. @@ -23487,5 +23482,5 @@ #. 50000 #. -#. +#. #. #. @@ -23494,5 +23489,5 @@ #. 50000 #. -#. +#. #. #. @@ -23501,5 +23496,5 @@ #. 50000 #. -#. +#. #. #. @@ -23508,5 +23503,5 @@ #. 50000 #. -#. +#. #. #. @@ -23515,5 +23510,5 @@ #. 50000 #. -#. +#. #. #. @@ -23522,5 +23517,5 @@ #. 50000 #. -#. +#. #. #. @@ -23529,5 +23524,5 @@ #. 50000 #. -#. +#. #. #. @@ -23536,5 +23531,5 @@ #. 50000 #. -#. +#. #. #. @@ -23543,5 +23538,5 @@ #. 50000 #. -#. +#. #. #. @@ -23550,5 +23545,5 @@ #. 50000 #. -#. +#. #. #. @@ -23557,5 +23552,5 @@ #. 50000 #. -#. +#. #. #. @@ -23564,5 +23559,5 @@ #. 50000 #. -#. +#. #. #. @@ -23571,5 +23566,5 @@ #. 50000 #. -#. +#. #. #. @@ -23740,7 +23735,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23754,5 +23749,5 @@ #. 40000 #. -#. +#. #. #. @@ -23762,7 +23757,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23772,5 +23767,5 @@ #. 50000 #. -#. +#. #. #. @@ -23780,5 +23775,5 @@ #. 50000 #. -#. +#. #. #. @@ -23788,5 +23783,5 @@ #. 50000 #. -#. +#. #. #. @@ -23796,5 +23791,5 @@ #. 50000 #. -#. +#. #. #. @@ -23810,5 +23805,5 @@ #. 10000 #. -#. +#. #. #. @@ -23818,5 +23813,5 @@ #. 50000 #. -#. +#. #. #. @@ -23826,5 +23821,5 @@ #. 50000 #. -#. +#. #. #. @@ -23834,5 +23829,5 @@ #. 50000 #. -#. +#. #. #. @@ -23842,5 +23837,5 @@ #. 50000 #. -#. +#. #. #. @@ -23850,5 +23845,5 @@ #. 50000 #. -#. +#. #. #. @@ -23858,5 +23853,5 @@ #. 50000 #. -#. +#. #. #. @@ -23875,5 +23870,5 @@ #. 50000 #. -#. +#. #. #. @@ -23882,5 +23877,5 @@ #. 50000 #. -#. +#. #. #. @@ -23894,5 +23889,5 @@ #. 50000 #. -#. +#. #. #. @@ -23906,5 +23901,5 @@ #. 50000 #. -#. +#. #. #. @@ -23913,5 +23908,5 @@ #. 50000 #. -#. +#. #. #. @@ -23925,5 +23920,5 @@ #. 50000 #. -#. +#. #. #. @@ -23938,5 +23933,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23951,5 +23946,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23963,5 +23958,5 @@ #. 50000 #. -#. +#. #. #. @@ -23975,5 +23970,5 @@ #. 50000 #. -#. +#. #. #. @@ -23982,5 +23977,5 @@ #. 50000 #. -#. +#. #. #. @@ -23989,5 +23984,5 @@ #. 50000 #. -#. +#. #. #. @@ -24001,5 +23996,5 @@ #. 50000 #. -#. +#. #. #. @@ -24009,5 +24004,5 @@ #. 50000 #. -#. +#. #. #. @@ -24016,5 +24011,5 @@ #. 50000 #. -#. +#. #. #. @@ -24023,5 +24018,5 @@ #. 50000 #. -#. +#. #. #. @@ -24030,5 +24025,5 @@ #. 50000 #. -#. +#. #. #. @@ -24038,5 +24033,5 @@ #. 50000 #. -#. +#. #. #. @@ -24047,5 +24042,5 @@ #. 50000 #. -#. +#. #. #. @@ -24055,7 +24050,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24065,5 +24060,5 @@ #. 50000 #. -#. +#. #. #. @@ -24073,5 +24068,5 @@ #. 50000 #. -#. +#. #. #. @@ -24081,5 +24076,5 @@ #. 50000 #. -#. +#. #. #. @@ -24090,5 +24085,5 @@ #. 50000 #. -#. +#. #. #. @@ -24098,5 +24093,5 @@ #. 50000 #. -#. +#. #. #. @@ -24106,5 +24101,5 @@ #. 50000 #. -#. +#. #. #. @@ -24114,5 +24109,5 @@ #. 50000 #. -#. +#. #. #. @@ -24122,5 +24117,5 @@ #. 50000 #. -#. +#. #. #. @@ -24130,5 +24125,5 @@ #. 50000 #. -#. +#. #. #. @@ -24138,5 +24133,5 @@ #. 50000 #. -#. +#. #. #. @@ -24146,5 +24141,5 @@ #. 50000 #. -#. +#. #. #. @@ -24154,5 +24149,5 @@ #. 50000 #. -#. +#. #. #. @@ -24175,7 +24170,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24185,5 +24180,5 @@ #. 50000 #. -#. +#. #. #. @@ -24192,5 +24187,5 @@ #. 50000 #. -#. +#. #. #. @@ -24200,5 +24195,5 @@ #. 50000 #. -#. +#. #. #. @@ -24207,5 +24202,5 @@ #. 50000 #. -#. +#. #. #. @@ -24215,5 +24210,5 @@ #. 50000 #. -#. +#. #. #. @@ -24223,5 +24218,5 @@ #. 50000 #. -#. +#. #. #. @@ -24237,5 +24232,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24246,5 +24241,5 @@ #. 50000 #. -#. +#. #. #. @@ -24263,5 +24258,5 @@ #. 50000 #. -#. +#. #. #. @@ -24271,5 +24266,5 @@ #. 50000 #. -#. +#. #. #. @@ -24282,5 +24277,5 @@ #. 50000 #. -#. +#. #. #. @@ -24298,5 +24293,5 @@ #. 50000 #. -#. +#. #. #. @@ -24305,5 +24300,5 @@ #. 50000 #. -#. +#. #. #. @@ -24312,5 +24307,5 @@ #. 50000 #. -#. +#. #. #. @@ -24319,7 +24314,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24330,5 +24325,5 @@ #. 50000 #. -#. +#. #. #. @@ -24343,5 +24338,5 @@ #. 50000 #. -#. +#. #. #. @@ -24355,5 +24350,5 @@ #. 50000 #. -#. +#. #. #. @@ -24363,5 +24358,5 @@ #. 50000 #. -#. +#. #. #. @@ -24375,5 +24370,5 @@ #. 50000 #. -#. +#. #. #. @@ -24387,5 +24382,5 @@ #. 50000 #. -#. +#. #. #. @@ -24394,7 +24389,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24404,5 +24399,5 @@ #. 50000 #. -#. +#. #. #. @@ -24412,5 +24407,5 @@ #. 50000 #. -#. +#. #. #. @@ -24420,5 +24415,5 @@ #. 50000 #. -#. +#. #. #. @@ -24428,5 +24423,5 @@ #. 50000 #. -#. +#. #. #. @@ -24442,7 +24437,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24457,5 +24452,5 @@ #. 30000 #. -#. +#. #. #. @@ -24470,5 +24465,5 @@ #. 30000 #. -#. +#. #. #. @@ -24483,5 +24478,5 @@ #. 30000 #. -#. +#. #. #. @@ -24496,5 +24491,5 @@ #. 30000 #. -#. +#. #. #. @@ -24509,5 +24504,5 @@ #. 30000 #. -#. +#. #. #. @@ -24522,7 +24517,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24532,5 +24527,5 @@ #. 50000 #. -#. +#. #. #. @@ -24539,5 +24534,5 @@ #. 50000 #. -#. +#. #. #. @@ -24547,5 +24542,5 @@ #. 50000 #. -#. +#. #. #. @@ -24555,5 +24550,5 @@ #. 50000 #. -#. +#. #. #. @@ -24563,5 +24558,5 @@ #. 50000 #. -#. +#. #. #. @@ -24571,5 +24566,5 @@ #. 50000 #. -#. +#. #. #. @@ -24579,5 +24574,5 @@ #. 50000 #. -#. +#. #. #. @@ -24587,5 +24582,5 @@ #. 50000 #. -#. +#. #. #. @@ -24595,5 +24590,5 @@ #. 50000 #. -#. +#. #. #. @@ -24603,5 +24598,5 @@ #. 50000 #. -#. +#. #. #. @@ -24611,5 +24606,5 @@ #. 50000 #. -#. +#. #. #. @@ -24619,5 +24614,5 @@ #. 50000 #. -#. +#. #. #. @@ -24627,5 +24622,5 @@ #. 50000 #. -#. +#. #. #. @@ -24645,5 +24640,5 @@ #. 50000 #. -#. +#. #. #. @@ -24658,5 +24653,5 @@ #. 50000 #. -#. +#. #. #. @@ -24669,7 +24664,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24679,5 +24674,5 @@ #. 50000 #. -#. +#. #. #. @@ -24687,5 +24682,5 @@ #. 50000 #. -#. +#. #. #. @@ -24695,5 +24690,5 @@ #. 50000 #. -#. +#. #. #. @@ -24703,5 +24698,5 @@ #. 50000 #. -#. +#. #. #. @@ -24711,5 +24706,5 @@ #. 50000 #. -#. +#. #. #. @@ -24719,5 +24714,5 @@ #. 50000 #. -#. +#. #. #. @@ -24727,5 +24722,5 @@ #. 50000 #. -#. +#. #. #. @@ -24735,5 +24730,5 @@ #. 50000 #. -#. +#. #. #. @@ -24743,5 +24738,5 @@ #. 50000 #. -#. +#. #. #. @@ -24751,5 +24746,5 @@ #. 50000 #. -#. +#. #. #. @@ -24759,5 +24754,5 @@ #. 50000 #. -#. +#. #. #. @@ -24767,5 +24762,5 @@ #. 50000 #. -#. +#. #. #. @@ -24775,5 +24770,5 @@ #. 50000 #. -#. +#. #. #. @@ -24783,5 +24778,5 @@ #. 50000 #. -#. +#. #. #. @@ -24802,5 +24797,5 @@ #. 50000 #. -#. +#. #. #. @@ -24814,7 +24809,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24824,5 +24819,5 @@ #. 50000 #. -#. +#. #. #. @@ -24832,5 +24827,5 @@ #. 50000 #. -#. +#. #. #. @@ -24840,5 +24835,5 @@ #. 50000 #. -#. +#. #. #. @@ -24848,5 +24843,5 @@ #. 50000 #. -#. +#. #. #. @@ -24856,5 +24851,5 @@ #. 50000 #. -#. +#. #. #. @@ -24864,5 +24859,5 @@ #. 50000 #. -#. +#. #. #. @@ -24872,5 +24867,5 @@ #. 50000 #. -#. +#. #. #. @@ -24887,5 +24882,5 @@ #. 50000 #. -#. +#. #. #. @@ -24895,5 +24890,5 @@ #. 50000 #. -#. +#. #. #. @@ -24903,5 +24898,5 @@ #. 50000 #. -#. +#. #. #. @@ -24911,5 +24906,5 @@ #. 50000 #. -#. +#. #. #. @@ -24919,5 +24914,5 @@ #. 50000 #. -#. +#. #. #. @@ -24927,5 +24922,5 @@ #. 50000 #. -#. +#. #. #. @@ -24935,5 +24930,5 @@ #. 50000 #. -#. +#. #. #. @@ -24943,5 +24938,5 @@ #. 50000 #. -#. +#. #. #. @@ -24951,5 +24946,5 @@ #. 50000 #. -#. +#. #. #. @@ -24959,5 +24954,5 @@ #. 50000 #. -#. +#. #. #. @@ -24967,5 +24962,5 @@ #. 50000 #. -#. +#. #. #. @@ -24975,5 +24970,5 @@ #. 50000 #. -#. +#. #. #. @@ -24992,5 +24987,5 @@ #. 50000 #. -#. +#. #. #. @@ -25000,5 +24995,5 @@ #. 50000 #. -#. +#. #. #. @@ -25007,5 +25002,5 @@ #. 50000 #. -#. +#. #. #. @@ -25015,5 +25010,5 @@ #. 50000 #. -#. +#. #. #. @@ -25023,5 +25018,5 @@ #. 50000 #. -#. +#. #. #. @@ -25031,5 +25026,5 @@ #. 50000 #. -#. +#. #. #. @@ -25038,5 +25033,5 @@ #. 50000 #. -#. +#. #. #. @@ -25046,5 +25041,5 @@ #. 50000 #. -#. +#. #. #. @@ -25054,5 +25049,5 @@ #. 50000 #. -#. +#. #. #. @@ -25062,5 +25057,5 @@ #. 50000 #. -#. +#. #. #. @@ -25070,5 +25065,5 @@ #. 50000 #. -#. +#. #. #. @@ -25077,5 +25072,5 @@ #. 50000 #. -#. +#. #. #. @@ -25084,5 +25079,5 @@ #. 50000 #. -#. +#. #. #. @@ -25091,5 +25086,5 @@ #. 50000 #. -#. +#. #. #. @@ -25098,5 +25093,5 @@ #. 50000 #. -#. +#. #. #. @@ -25105,5 +25100,5 @@ #. 50000 #. -#. +#. #. #. @@ -25112,5 +25107,5 @@ #. 50000 #. -#. +#. #. #. @@ -25119,5 +25114,5 @@ #. 50000 #. -#. +#. #. #. @@ -25126,5 +25121,5 @@ #. 50000 #. -#. +#. #. #. @@ -25133,5 +25128,5 @@ #. 50000 #. -#. +#. #. #. @@ -25140,5 +25135,5 @@ #. 50000 #. -#. +#. #. #. @@ -25147,5 +25142,5 @@ #. 50000 #. -#. +#. #. #. @@ -25154,5 +25149,5 @@ #. 50000 #. -#. +#. #. #. @@ -25161,5 +25156,5 @@ #. 50000 #. -#. +#. #. #. @@ -25169,5 +25164,5 @@ #. 50000 #. -#. +#. #. #. @@ -25177,5 +25172,5 @@ #. 50000 #. -#. +#. #. #. @@ -25185,5 +25180,5 @@ #. 50000 #. -#. +#. #. #. @@ -25193,5 +25188,5 @@ #. 50000 #. -#. +#. #. #. @@ -25201,5 +25196,5 @@ #. 50000 #. -#. +#. #. #. @@ -25209,5 +25204,5 @@ #. 50000 #. -#. +#. #. #. @@ -25217,5 +25212,5 @@ #. 50000 #. -#. +#. #. #. @@ -25225,5 +25220,5 @@ #. 50000 #. -#. +#. #. #. @@ -25233,5 +25228,5 @@ #. 50000 #. -#. +#. #. #. @@ -25242,5 +25237,5 @@ #. 50000 #. -#. +#. #. #. @@ -25250,5 +25245,5 @@ #. 50000 #. -#. +#. #. #. @@ -25258,5 +25253,5 @@ #. 50000 #. -#. +#. #. #. @@ -25266,5 +25261,5 @@ #. 50000 #. -#. +#. #. #. @@ -25274,5 +25269,5 @@ #. 50000 #. -#. +#. #. #. @@ -25282,5 +25277,5 @@ #. 50000 #. -#. +#. #. #. @@ -25290,5 +25285,5 @@ #. 50000 #. -#. +#. #. #. @@ -25298,5 +25293,5 @@ #. 50000 #. -#. +#. #. #. @@ -25306,5 +25301,5 @@ #. 50000 #. -#. +#. #. #. @@ -25314,5 +25309,5 @@ #. 50000 #. -#. +#. #. #. @@ -25322,5 +25317,5 @@ #. 50000 #. -#. +#. #. #. @@ -25330,5 +25325,5 @@ #. 50000 #. -#. +#. #. #. @@ -25338,5 +25333,5 @@ #. 50000 #. -#. +#. #. #. @@ -25346,5 +25341,5 @@ #. 50000 #. -#. +#. #. #. @@ -25354,5 +25349,5 @@ #. 50000 #. -#. +#. #. #. @@ -25362,5 +25357,5 @@ #. 50000 #. -#. +#. #. #. @@ -25370,5 +25365,5 @@ #. 50000 #. -#. +#. #. #. @@ -25378,5 +25373,5 @@ #. 50000 #. -#. +#. #. #. @@ -25386,5 +25381,5 @@ #. 50000 #. -#. +#. #. #. @@ -25393,5 +25388,5 @@ #. 50000 #. -#. +#. #. #. @@ -25423,5 +25418,5 @@ #. 50000 #. -#. +#. #. #. @@ -25431,5 +25426,5 @@ #. 50000 #. -#. +#. #. #. @@ -25439,7 +25434,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25454,5 +25449,5 @@ #. 50000 #. -#. +#. #. #. @@ -25462,5 +25457,5 @@ #. 50000 #. -#. +#. #. #. @@ -25470,5 +25465,5 @@ #. 50000 #. -#. +#. #. #. @@ -25478,5 +25473,5 @@ #. 50000 #. -#. +#. #. #. @@ -25486,5 +25481,5 @@ #. 50000 #. -#. +#. #. #. @@ -25494,5 +25489,5 @@ #. 50000 #. -#. +#. #. #. @@ -25502,5 +25497,5 @@ #. 50000 #. -#. +#. #. #. @@ -25516,7 +25511,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25526,5 +25521,5 @@ #. 50000 #. -#. +#. #. #. @@ -25534,5 +25529,5 @@ #. 50000 #. -#. +#. #. #. @@ -25542,5 +25537,5 @@ #. 50000 #. -#. +#. #. #. @@ -25550,5 +25545,5 @@ #. 50000 #. -#. +#. #. #. @@ -25558,5 +25553,5 @@ #. 50000 #. -#. +#. #. #. @@ -25566,5 +25561,5 @@ #. 50000 #. -#. +#. #. #. @@ -25574,5 +25569,5 @@ #. 50000 #. -#. +#. #. #. @@ -25582,5 +25577,5 @@ #. 50000 #. -#. +#. #. #. @@ -25590,5 +25585,5 @@ #. 50000 #. -#. +#. #. #. @@ -25598,5 +25593,5 @@ #. 50000 #. -#. +#. #. #. @@ -25606,5 +25601,5 @@ #. 50000 #. -#. +#. #. #. @@ -25614,5 +25609,5 @@ #. 50000 #. -#. +#. #. #. @@ -25622,5 +25617,5 @@ #. 50000 #. -#. +#. #. #. @@ -25630,5 +25625,5 @@ #. 50000 #. -#. +#. #. #. @@ -25638,5 +25633,5 @@ #. 50000 #. -#. +#. #. #. @@ -25646,5 +25641,5 @@ #. 50000 #. -#. +#. #. #. @@ -25654,5 +25649,5 @@ #. 50000 #. -#. +#. #. #. @@ -25662,5 +25657,5 @@ #. 50000 #. -#. +#. #. #. @@ -25670,5 +25665,5 @@ #. 50000 #. -#. +#. #. #. @@ -25678,5 +25673,5 @@ #. 50000 #. -#. +#. #. #. @@ -25686,5 +25681,5 @@ #. 50000 #. -#. +#. #. #. @@ -25694,5 +25689,5 @@ #. 50000 #. -#. +#. #. #. @@ -25702,5 +25697,5 @@ #. 50000 #. -#. +#. #. #. @@ -25710,5 +25705,5 @@ #. 50000 #. -#. +#. #. #. @@ -25718,5 +25713,5 @@ #. 50000 #. -#. +#. #. #. @@ -25726,5 +25721,5 @@ #. 50000 #. -#. +#. #. #. @@ -25734,5 +25729,5 @@ #. 50000 #. -#. +#. #. #. @@ -25742,5 +25737,5 @@ #. 50000 #. -#. +#. #. #. @@ -25750,5 +25745,5 @@ #. 50000 #. -#. +#. #. #. @@ -25758,5 +25753,5 @@ #. 50000 #. -#. +#. #. #. @@ -25766,5 +25761,5 @@ #. 50000 #. -#. +#. #. #. @@ -25774,5 +25769,5 @@ #. 50000 #. -#. +#. #. #. @@ -25782,5 +25777,5 @@ #. 50000 #. -#. +#. #. #. @@ -25790,5 +25785,5 @@ #. 50000 #. -#. +#. #. #. @@ -25798,5 +25793,5 @@ #. 50000 #. -#. +#. #. #. @@ -25806,5 +25801,5 @@ #. 50000 #. -#. +#. #. #. @@ -25814,5 +25809,5 @@ #. 50000 #. -#. +#. #. #. @@ -25822,5 +25817,5 @@ #. 50000 #. -#. +#. #. #. @@ -25830,5 +25825,5 @@ #. 50000 #. -#. +#. #. #. @@ -25838,5 +25833,5 @@ #. 50000 #. -#. +#. #. #. @@ -25846,5 +25841,5 @@ #. 50000 #. -#. +#. #. #. @@ -25854,5 +25849,5 @@ #. 50000 #. -#. +#. #. #. @@ -25888,7 +25883,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25898,5 +25893,5 @@ #. 50000 #. -#. +#. #. #. @@ -25906,5 +25901,5 @@ #. 50000 #. -#. +#. #. #. @@ -25914,5 +25909,5 @@ #. 50000 #. -#. +#. #. #. @@ -25922,5 +25917,5 @@ #. 50000 #. -#. +#. #. #. @@ -25930,5 +25925,5 @@ #. 50000 #. -#. +#. #. #. @@ -25938,5 +25933,5 @@ #. 50000 #. -#. +#. #. #. @@ -25946,5 +25941,5 @@ #. 50000 #. -#. +#. #. #. @@ -25961,5 +25956,5 @@ #. 50000 #. -#. +#. #. #. @@ -25969,5 +25964,5 @@ #. 50000 #. -#. +#. #. #. @@ -25977,5 +25972,5 @@ #. 50000 #. -#. +#. #. #. @@ -25985,5 +25980,5 @@ #. 50000 #. -#. +#. #. #. @@ -25993,5 +25988,5 @@ #. 50000 #. -#. +#. #. #. @@ -26001,5 +25996,5 @@ #. 50000 #. -#. +#. #. #. @@ -26010,5 +26005,5 @@ #. 50000 #. -#. +#. #. #. @@ -26018,5 +26013,5 @@ #. 50000 #. -#. +#. #. #. @@ -26026,5 +26021,5 @@ #. 40000 #. -#. +#. #. #. @@ -26034,5 +26029,5 @@ #. 50000 #. -#. +#. #. #. @@ -26041,5 +26036,5 @@ #. 40000 #. -#. +#. #. #. @@ -26048,5 +26043,5 @@ #. 40000 #. -#. +#. #. #. @@ -26064,7 +26059,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26074,5 +26069,5 @@ #. 50000 #. -#. +#. #. #. @@ -26082,5 +26077,5 @@ #. 50000 #. -#. +#. #. #. @@ -26090,5 +26085,5 @@ #. 50000 #. -#. +#. #. #. @@ -26098,5 +26093,5 @@ #. 50000 #. -#. +#. #. #. @@ -26106,5 +26101,5 @@ #. 50000 #. -#. +#. #. #. @@ -26114,5 +26109,5 @@ #. 50000 #. -#. +#. #. #. @@ -26122,5 +26117,5 @@ #. 50000 #. -#. +#. #. #. @@ -26130,5 +26125,5 @@ #. 50000 #. -#. +#. #. #. @@ -26138,5 +26133,5 @@ #. 50000 #. -#. +#. #. #. @@ -26155,5 +26150,5 @@ #. 50000 #. -#. +#. #. #. @@ -26167,5 +26162,5 @@ #. 50000 #. -#. +#. #. #. @@ -26179,5 +26174,5 @@ #. 50000 #. -#. +#. #. #. @@ -26187,5 +26182,5 @@ #. 50000 #. -#. +#. #. #. @@ -26199,5 +26194,5 @@ #. 50000 #. -#. +#. #. #. @@ -26211,5 +26206,5 @@ #. 50000 #. -#. +#. #. #. @@ -26223,6 +26218,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26232,5 +26227,5 @@ #. 50000 #. -#. +#. #. #. @@ -26244,5 +26239,5 @@ #. 50000 #. -#. +#. #. #. @@ -26256,5 +26251,5 @@ #. 50000 #. -#. +#. #. #. @@ -26268,5 +26263,5 @@ #. 50000 #. -#. +#. #. #. @@ -26280,5 +26275,5 @@ #. 50000 #. -#. +#. #. #. @@ -26292,5 +26287,5 @@ #. 50000 #. -#. +#. #. #. @@ -26300,7 +26295,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26310,5 +26305,5 @@ #. 50000 #. -#. +#. #. #. @@ -26318,5 +26313,5 @@ #. 50000 #. -#. +#. #. #. @@ -26326,5 +26321,5 @@ #. 50000 #. -#. +#. #. #. @@ -26334,5 +26329,5 @@ #. 50000 #. -#. +#. #. #. @@ -26349,5 +26344,5 @@ #. 50000 #. -#. +#. #. #. @@ -26360,5 +26355,5 @@ #. 50000 #. -#. +#. #. #. @@ -26372,5 +26367,5 @@ #. 50000 #. -#. +#. #. #. @@ -26384,5 +26379,5 @@ #. 50000 #. -#. +#. #. #. @@ -26396,5 +26391,5 @@ #. 50000 #. -#. +#. #. #. @@ -26405,5 +26400,5 @@ #. 50000 #. -#. +#. #. #. @@ -26413,5 +26408,5 @@ #. 50000 #. -#. +#. #. #. @@ -26421,5 +26416,5 @@ #. 50000 #. -#. +#. #. #. @@ -26429,5 +26424,5 @@ #. 50000 #. -#. +#. #. #. @@ -26437,5 +26432,5 @@ #. 50000 #. -#. +#. #. #. @@ -26452,5 +26447,5 @@ #. 50000 #. -#. +#. #. #. @@ -26464,5 +26459,5 @@ #. 50000 #. -#. +#. #. #. @@ -26476,5 +26471,5 @@ #. 50000 #. -#. +#. #. #. @@ -26488,5 +26483,5 @@ #. 50000 #. -#. +#. #. #. @@ -26500,5 +26495,5 @@ #. 50000 #. -#. +#. #. #. @@ -26512,5 +26507,5 @@ #. 50000 #. -#. +#. #. #. @@ -26519,7 +26514,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26529,5 +26524,5 @@ #. 50000 #. -#. +#. #. #. @@ -26537,5 +26532,5 @@ #. 50000 #. -#. +#. #. #. @@ -26545,5 +26540,5 @@ #. 50000 #. -#. +#. #. #. @@ -26553,5 +26548,5 @@ #. 50000 #. -#. +#. #. #. @@ -26561,5 +26556,5 @@ #. 50000 #. -#. +#. #. #. @@ -26569,5 +26564,5 @@ #. 50000 #. -#. +#. #. #. @@ -26577,5 +26572,5 @@ #. 50000 #. -#. +#. #. #. @@ -26592,7 +26587,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26602,5 +26597,5 @@ #. 50000 #. -#. +#. #. #. @@ -26610,5 +26605,5 @@ #. 50000 #. -#. +#. #. #. @@ -26618,5 +26613,5 @@ #. 50000 #. -#. +#. #. #. @@ -26626,5 +26621,5 @@ #. 50000 #. -#. +#. #. #. @@ -26640,5 +26635,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26687,5 +26682,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26695,5 +26690,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26703,5 +26698,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26711,5 +26706,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26719,5 +26714,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26727,5 +26722,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26735,5 +26730,5 @@ #. 50000 #. -#. +#. #. #. @@ -26743,5 +26738,5 @@ #. 50000 #. -#. +#. #. #. @@ -26751,5 +26746,5 @@ #. 50000 #. -#. +#. #. #. @@ -26759,5 +26754,5 @@ #. 50000 #. -#. +#. #. #. @@ -26767,5 +26762,5 @@ #. 50000 #. -#. +#. #. #. @@ -26775,5 +26770,5 @@ #. 50000 #. -#. +#. #. #. @@ -26793,5 +26788,5 @@ #. 50000 #. -#. +#. #. #. @@ -26800,5 +26795,5 @@ #. 50000 #. -#. +#. #. #. @@ -26807,5 +26802,5 @@ #. 50000 #. -#. +#. #. #. @@ -26814,5 +26809,5 @@ #. 40000 #. -#. +#. #. #. @@ -26821,5 +26816,5 @@ #. 40000 #. -#. +#. #. #. @@ -26828,5 +26823,5 @@ #. 40000 #. -#. +#. #. #. @@ -26921,5 +26916,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -26927,28 +26922,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 @@ -27063,5 +27058,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27074,5 +27069,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27097,6 +27092,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27105,6 +27100,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27119,6 +27114,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 @@ -27132,6 +27127,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 @@ -27151,6 +27146,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27174,6 +27169,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 @@ -27185,4 +27180,64 @@ 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 "No images with readable timestamps found." +#~ msgstr "Δεν βρέθηκαν εικόνες με αναγνώσιμη χρονοσήμανση." + +#~ msgid "GPS start: {0}" +#~ msgstr "Αρχή GPS: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "Τέλος GPS: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "τρέχουσα διαφορά: {0} δευτερόλεπτα" + +#~ msgid "timezone difference: " +#~ msgstr "διαφορά στη ζώνη ώρας: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} μέσα στο ίχνος" + +#~ msgid "Sync clock" +#~ msgstr "Συγχρονισμός ρολογιού" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Η ημερομηνία στο αρχείο \"{0}\" δεν μπόρεσε να ερμηνευθεί." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Δεν υπάρχει ώρα EXIF μέσα στο αρχείο \"{0}\"." + +#~ msgid "Image" +#~ msgstr "Εικόνα" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Εισάγετε την εμφνιζόμενη ημερομηνία (μμ/ηη/εεεε ΩΩ:ΛΛ:ΔΔ)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "ζώνη ώρας της συσκευής GPS (διαφορά από την φωτογραφία)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Συγχρονισμός Ώρας με τη μονάδα GPS" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί." + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Άνοιγμα εικόνων με το AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "επιλογές osmarender" #~ msgid "" @@ -27190,6 +27245,6 @@ #~ "about the problem." #~ msgstr "" -#~ "Το πρόσθετο δεν μπορεί να αφαιρεθεί. Παρακαλώ πείτε στα άτομα από τα οποία " -#~ "πήρατε το JOSM για το πρόβλημα." +#~ "Το πρόσθετο δεν μπορεί να αφαιρεθεί. Παρακαλώ πείτε στα άτομα από τα " +#~ "οποία πήρατε το JOSM για το πρόβλημα." #~ msgid "Unknown version" @@ -27199,5 +27254,4 @@ #~ msgstr " έχει μηδενική αναφορά" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Το πρόσθετο απαιτεί ενημέρωση του JOSM: {0}." @@ -27206,5 +27260,4 @@ #~ msgstr "Μη αποθηκευμένες αλλαγές" -#, java-format #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." @@ -27222,11 +27275,11 @@ #~ "setting the config option 'pluginmanager.warntime'.)" #~ msgstr "" -#~ "(Μπορείτε να αλλάξετε τις μέρες έπειτα από τις οποίες αυτή η προειδοποίηση " -#~ "εμφανίζεται
θέτωντας την επιλογή 'pluginmanager.warntime' στην " -#~ "διαμόρφωση.)" +#~ "(Μπορείτε να αλλάξετε τις μέρες έπειτα από τις οποίες αυτή η " +#~ "προειδοποίηση εμφανίζεται
θέτωντας την επιλογή 'pluginmanager." +#~ "warntime' στην διαμόρφωση.)" #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" #~ "Προσπαθήστε να αναβαθμίσετε στην τελευταία έκδοση του JOSM και όλων των " @@ -27266,5 +27319,4 @@ #~ msgstr "Άνοιγμα σε Φυλλομετρητή" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Σφάλμα κατά την φόρτωση της σελίδας {0}" @@ -27273,7 +27325,4 @@ #~ msgstr "Το αρχείο δεν βρέθηκε" -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "ΠΑρακλώ εισάγετε τις επιθυμητές συντεταγένες πρώτα." - #~ msgid "Contacting the OSM server..." #~ msgstr "Επικοινωνία με τον διακομιστή OSM..." @@ -27282,10 +27331,9 @@ #~ msgstr "όνομα" -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "Το πρόσθετο {0} μοιάζει χαλασμένο ή δεν μπόρεσε να ληφθεί αυτόματα." -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Αδυναμία λήψης πρόσθετου: {0} από {1}" @@ -27293,5 +27341,6 @@ #~ msgid "Include your steps to get to the error (as detailed as possible)!" #~ msgstr "" -#~ "Συμπεριλάβετε τα βήματα ποθ οδήγησαν στο σφάλμα (όσο πιο λεπτομερώς γίνεται)!" +#~ "Συμπεριλάβετε τα βήματα ποθ οδήγησαν στο σφάλμα (όσο πιο λεπτομερώς " +#~ "γίνεται)!" #~ msgid "Be sure to include the following information:" @@ -27304,5 +27353,4 @@ #~ msgstr "διαφορετικά" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27319,16 +27367,16 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" -#~ "Εσωτερικό σφάλμα: αδύνατος ο έλεγχος συνθηκών για κανένα επίπεδο. Παρακαλώ " -#~ "αναφέρετε το σαν σφάλμα." +#~ "Εσωτερικό σφάλμα: αδύνατος ο έλεγχος συνθηκών για κανένα επίπεδο. " +#~ "Παρακαλώ αναφέρετε το σαν σφάλμα." #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Οι επιλεγμένοι κόμβοι είναι μέλη σε διαφορετικές σχέσεις. Επιθυμείτε να τους " -#~ "συγχωνεύσετε;" +#~ "Οι επιλεγμένοι κόμβοι είναι μέλη σε διαφορετικές σχέσεις. Επιθυμείτε να " +#~ "τους συγχωνεύσετε;" #~ msgid "Merge nodes with different memberships?" @@ -27353,8 +27401,4 @@ #~ msgstr "Όνομα χρήστη OSM (email)" -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Σφάλμα κατά την διαγραφή του αρχείου πρόσθετου: {0}" - #~ msgid "Plugin already exists" #~ msgstr "Το πρόσθετο υπάρχει ήδη" @@ -27376,9 +27420,9 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" -#~ "Επαναφορά της κατάστασης όλων των επιλεγμένων αντικειμένων στην έκδοση που " -#~ "έχει απιλεγεί στη λίστα ιστορικού." +#~ "Επαναφορά της κατάστασης όλων των επιλεγμένων αντικειμένων στην έκδοση " +#~ "που έχει απιλεγεί στη λίστα ιστορικού." #~ msgid "Object" @@ -27406,12 +27450,7 @@ #~ msgstr "Πλοήγηση" -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Διαγραφή {1} {0}" - #~ msgid "JOSM Online Help" #~ msgstr "Online βοήθεια του JOSM" -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -27420,6 +27459,6 @@ #~ "{0}" #~ msgstr "" -#~ "Το αρχείο του πρόσθετου είναι ήδη διαθέσιμο. Θέλετε να λάβετε την τρέχουσα " -#~ "έκδοση διαγράφοντας το υπάρχον αρχείο;\n" +#~ "Το αρχείο του πρόσθετου είναι ήδη διαθέσιμο. Θέλετε να λάβετε την " +#~ "τρέχουσα έκδοση διαγράφοντας το υπάρχον αρχείο;\n" #~ "\n" #~ "{0}" @@ -27453,9 +27492,7 @@ #~ "Η επεξεργασία σελίδων βοήθειας έιναι δυνατή μόνο από το JOSM Online Help" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\"" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Χρήση προεπιλογής \"{0}\"" @@ -27470,9 +27507,7 @@ #~ msgstr "Σφάλμα κατά την ανάλυση της απάντησης του διακομιστή." -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Συγγραφείς: {0}" -#, java-format #~ msgid "requested: {0}" #~ msgstr "ζητήθηκαν: {0}" @@ -27561,6 +27596,6 @@ #~ "some time." #~ msgstr "" -#~ "Ο διακομιστής επέστρεψε εσωτερικό σφάλμα. Δοκιμάστε μια μικρότερη περιοχή ή " -#~ "ξαναδοκιμάστε αργότερα." +#~ "Ο διακομιστής επέστρεψε εσωτερικό σφάλμα. Δοκιμάστε μια μικρότερη περιοχή " +#~ "ή ξαναδοκιμάστε αργότερα." #~ msgid "There were conflicts during import." @@ -27585,5 +27620,4 @@ #~ msgstr "Επιβεβαίωση συγχώνευσης" -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -27593,5 +27627,4 @@ #~ "συνεχίσετε;" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Αδυναμία ανοίγματος φακέλου προτιμήσεων: {0}" @@ -27603,5 +27636,4 @@ #~ msgstr "επιλυμένη έκδοση:" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27612,5 +27644,4 @@ #~ msgstr "Επίλυση Διενέξεων" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Διενέξεις: {0}" @@ -27628,5 +27659,4 @@ #~ msgstr "Μετακίνηση Πάνω" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Επεξεργαστής Σχέσεων: {0}" @@ -27638,5 +27668,4 @@ #~ msgstr "Δημόσιο" -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "Αλλάξτε την προβολή σε {0} πρώτα." @@ -27659,5 +27688,4 @@ #~ msgstr "Εμφάνιση πίνακα Συγγραφέα" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Παρακαλώ αναφέρετε ένα δελτίο στο {0}" @@ -27676,8 +27704,9 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" -#~ "Δεν βρέθηκαν δεδομένα για ενημέρωση. Έχετε ήδη ανοίξει ή λάβει ένα επίπεδο " -#~ "δεδομένων;" +#~ "Δεν βρέθηκαν δεδομένα για ενημέρωση. Έχετε ήδη ανοίξει ή λάβει ένα " +#~ "επίπεδο δεδομένων;" #~ msgid "Please select one or more closed ways of at least four nodes." @@ -27729,14 +27758,14 @@ #~ msgid "Helppage missing. Create it in English." #~ msgstr "" -#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα αγγλικά." +#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα αγγλικά." #~ msgid "" -#~ "Helppage missing. Create it in English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" -#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα αγγλικά ή " -#~ "στη γλώσσα σας." - -#, java-format +#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα αγγλικά ή στη γλώσσα σας." + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}" Index: /applications/editors/josm/i18n/po/en_GB.po =================================================================== --- /applications/editors/josm/i18n/po/en_GB.po (revision 18974) +++ /applications/editors/josm/i18n/po/en_GB.po (revision 18975) @@ -10,5 +10,5 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 16:20+0100\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" "PO-Revision-Date: 2009-11-24 13:31+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\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" @@ -31,6 +31,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 @@ -47,7 +47,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 @@ -63,19 +63,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 @@ -88,9 +87,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" @@ -118,5 +117,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 @@ -139,9 +138,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 @@ -157,20 +156,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 @@ -189,7 +184,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 "Error" @@ -269,5 +264,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 "Plugins" @@ -314,4 +309,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 @@ -319,8 +316,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 @@ -330,29 +327,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 @@ -381,9 +376,9 @@ #, java-format msgid "" -"There are no layers the source layer
''{0}''
could be merged " -"to." -msgstr "" -"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 "" +"There are no layers the source layer
''{0}''
could be merged to." +"" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 @@ -434,14 +429,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 "Latitude" #: ../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 "Longitude" @@ -467,10 +462,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 @@ -501,19 +496,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 @@ -522,9 +520,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 @@ -540,7 +535,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 @@ -552,11 +547,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" @@ -644,5 +639,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}" @@ -697,10 +692,10 @@ "nodes)" -#: ../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 "Combine {0} ways" -#: ../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 "Please select at least two ways to combine." @@ -719,19 +714,19 @@ msgstr "Please select something to copy." +#: ../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 "Create Circle" -#: ../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 "Create a circle from three selected nodes." -#: ../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 "Those nodes are not in a circle. Aborting." -#: ../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 " @@ -744,9 +739,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 @@ -818,21 +813,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" @@ -840,6 +839,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 @@ -868,5 +867,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 "Duplicate" @@ -923,8 +922,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 @@ -932,5 +929,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 @@ -943,8 +940,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 @@ -963,8 +960,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 @@ -987,13 +984,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 @@ -1033,4 +1031,105 @@ msgstr "Display object information about OSM nodes, ways, or relations." +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "Join overlapping Areas" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Joins areas that overlap each other" +msgstr "Joins areas that overlap each other" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +msgid "Only up to two areas can be joined at the moment." +msgstr "Only up to two areas can be joined at the moment." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#, java-format +msgid "\"{0}\" is not closed and therefore can't be joined." +msgstr "\"{0}\" is not closed and therefore can't be joined." + +#: ../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 "" +"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?" + +#: ../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 "Please abort if you are not sure" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 +msgid "Please select at least one closed way the should be joined." +msgstr "Please select at least one closed way the should be joined." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +msgid "No intersection found. Nothing was changed." +msgstr "No intersection found. Nothing was changed." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +msgid "Added node on all intersections" +msgstr "Added node on all intersections" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgid "Delete Ways that are not part of an inner multipolygon" +msgstr "Delete Ways that are not part of an inner multipolygon" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +msgid "Fix relations" +msgstr "Fix relations" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgid "Joined self-overlapping area" +msgstr "Joined self-overlapping area" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +msgid "Joined overlapping areas" +msgstr "Joined overlapping areas" + +#: ../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 "" +"Some of the ways were part of relations that have been modified. Please " +"verify no errors have been introduced." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +msgid "Enter values for all conflicts." +msgstr "Enter values for all conflicts." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Solve Conflicts" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +msgid "Fix tag conflicts" +msgstr "Fix tag conflicts" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +msgid "Removed Element from Relations" +msgstr "Removed Element from Relations" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +msgid "Join Areas: Remove Short Ways" +msgstr "Join Areas: Remove Short Ways" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +msgid "Closed Way" +msgstr "Closed Way" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgid "Remove tags from inner ways" +msgstr "Remove tags from inner ways" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +msgid "Join Areas Function" +msgstr "Join Areas Function" + #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 @@ -1050,4 +1149,45 @@ msgstr "No Shortcut" +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Jump To Position" +msgstr "Jump To Position" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Opens a dialog that allows to jump to a specific location" +msgstr "Opens a dialog that allows to jump to a specific location" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57 +msgid "Enter Lat/Lon to jump to position." +msgstr "Enter Lat/Lon to jump to position." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 +msgid "You can also paste an URL from www.openstreetmap.org" +msgstr "You can also paste an URL from www.openstreetmap.org" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 +msgid "Zoom (in metres)" +msgstr "Zoom (in metres)" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 +msgid "URL" +msgstr "URL" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 +msgid "Jump there" +msgstr "Jump there" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 +msgid "Jump to Position" +msgstr "Jump to Position" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Could not parse Latitude, Longitude or Zoom. Please check." +msgstr "Could not parse Latitude, Longitude or Zoom. Please check." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Unable to parse Lon/Lat" +msgstr "Unable to parse Lon/Lat" + #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" @@ -1058,26 +1198,26 @@ msgstr "Merge the current layer into another layer" +#: ../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 "Merge Nodes" -#: ../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 "Merge nodes into the oldest one." -#: ../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 "Please select at least two nodes to merge." -#: ../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 "" @@ -1085,5 +1225,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" @@ -1461,6 +1601,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 "" "Show status report with useful information that can be attached to bugs" @@ -1481,9 +1620,43 @@ #: ../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 "Close" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Simplify Way" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Delete unnecessary nodes from a way." + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "Please select at least one way to simplify." + +#: ../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] "" +"The selection contains {0} way. Are you sure you want to simplify it?" +msgstr[1] "" +"The selection contains {0} ways. Are you sure you want to simplify them all?" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 +msgid "Are you sure?" +msgstr "Are you sure?" + +#: ../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] "Simplify Way (remove {0} node)" +msgstr[1] "Simplify Way (remove {0} nodes)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1616,8 +1789,6 @@ #: ../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" -msgstr "" -"* 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 "* One node that is used by more than one way and one of those ways, or" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 @@ -1698,24 +1869,24 @@ #. 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 "Download data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "No current dataset found" msgstr "No current dataset found" -#: ../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)" @@ -1723,30 +1894,30 @@ "Updates the currently selected objects from the server (re-downloads data)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 msgid "Update Selection" msgstr "Update Selection" +#: ../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 "Selection empty" -#: ../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 "Upload data" -#: ../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 "" @@ -1757,35 +1928,35 @@ "resolve them first." -#: ../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 "No changes to upload." -#: ../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 "Nothing to upload. Get some data first." -#: ../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 "Synchronize entire dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1793,41 +1964,37 @@ "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.
" +"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 "" "Uploading failed because the server has a newer " "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.
" - -#: ../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.
" + +#: ../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 "Conflicts detected" -#: ../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.
" +"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 "" "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.
" - -#: ../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.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1840,22 +2007,22 @@ "again with a new or an existing open changeset." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 msgid "Changeset closed" msgstr "Changeset closed" -#: ../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 "" @@ -1866,15 +2033,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 "Updating primitive" @@ -1886,6 +2053,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 "" @@ -1894,38 +2061,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 "Upload selection" -#: ../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 "Checking parents for deleted objects" -#: ../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 "Reading parents of ''{0}''" -#: ../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 "Checking for deleted parents in the local dataset" @@ -2090,12 +2256,12 @@ "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 "" "There are {0} primitives in your local dataset which
might be " "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.
" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183 @@ -2163,38 +2329,38 @@ msgstr "selected" -#: ../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 "Cannot add a node outside of the world." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Add node" -#: ../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 "Add node into way" -#: ../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 "Connect existing way to node" -#: ../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 "Add a new node to an existing way" -#: ../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 "Add node into way and connect" -#: ../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 "Create new node." -#: ../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 "Select node under cursor." -#: ../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." @@ -2203,14 +2369,14 @@ msgstr[1] "Insert new node into {0} ways." -#: ../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 "Start new way from last node." -#: ../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 "Continue way from last node." -#: ../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 "Finish drawing." @@ -2245,9 +2411,9 @@ #: ../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." -msgstr "" -"Drag play head and release near track to play audio from there; " -"SHIFT+release to synchronise 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 "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronise audio at that point." #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 @@ -2349,5 +2515,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." @@ -2433,12 +2599,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - all objects changed by user" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - object with given ID (0 for new objects)" -#: ../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 "nodes:... - object with given number of nodes" -#: ../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-" @@ -2446,21 +2617,21 @@ 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 "modified - all changed objects" -#: ../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 "selected - all selected objects" -#: ../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 "incomplete - all incomplete objects" -#: ../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 "untagged - all untagged objects" -#: ../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" @@ -2468,5 +2639,5 @@ "child expr - all children of objects matching the expression" -#: ../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" @@ -2474,17 +2645,17 @@ "parent expr - all parents of objects matching the expression" -#: ../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 "Use | or OR to combine with logical or" -#: ../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 "Use \" to quote operators (e.g. if key contains :)" -#: ../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 "Use ( and ) to group expressions" -#: ../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 @@ -2494,55 +2665,55 @@ msgstr "Filter" -#: ../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 "Search" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Submit filter" msgstr "Submit filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Start Search" msgstr "Start Search" -#: ../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 "No match found for ''{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 "Nothing added to selection by searching for ''{0}''" -#: ../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 "Nothing removed from selection by searching for ''{0}''" -#: ../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 "Nothing found in selection by searching for ''{0}''" -#: ../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 "Found {0} matches" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2555,41 +2726,40 @@ "{2}" -#: ../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 "Key cannot be empty when tag operator is used. Sample use: key=value" -#: ../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 "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -#: ../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 "" -"Unknown primitive type: {0}. Allowed values are node, way or relation" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 +msgstr "Unknown primitive type: {0}. Allowed values are node, way or relation" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 #, java-format msgid "Unexpected token: {0}" msgstr "Unexpected token: {0}" -#: ../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 "Missing arguments for or." -#: ../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 "Missing argument for not." -#: ../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 "Expected closing bracket." -#: ../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 "" @@ -2598,9 +2768,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 "Wrong number of parameters for nodes operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 #, java-format msgid "" @@ -2611,5 +2781,5 @@ "nodes or range, for example nodes:10-20" -#: ../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." @@ -2660,16 +2830,15 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" +#, fuzzy, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" "Warning: automatically truncating value of tag ''{0}'' on deleted primitive " "{1}" -msgstr "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2812,5 +2981,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 "Double conflict" @@ -2831,5 +3000,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 "" @@ -2849,19 +3019,19 @@ msgstr "cannot resolve undecided conflict" +#: ../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" @@ -2870,5 +3040,5 @@ msgstr[1] "Delete {0} objects" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2877,5 +3047,5 @@ msgstr[1] "Delete {0} nodes" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2884,5 +3054,5 @@ msgstr[1] "Delete {0} ways" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2893,16 +3063,16 @@ #. 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 "" -"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 be using them.
Do you really want to delete?" - -#: ../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 "" +"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 " +"be using them.
Do you really want to delete?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "Delete confirmation" @@ -2920,15 +3090,15 @@ msgstr[1] "Move {0} nodes" -#: ../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 "Purged object ''{0}''" -#: ../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 "Purged {0} objects" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154 #, java-format msgid "" @@ -2939,5 +3109,5 @@ "{1}" -#: ../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}" @@ -2948,10 +3118,4 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Resolve conflicts in member list of relation {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3030,5 +3194,5 @@ msgstr "Apply?" -#: ../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 " @@ -3186,9 +3350,9 @@ #, java-format msgid "" -"Preferences file had errors.
Making backup of old one to " -"
{0}
and creating a new default preference file." -msgstr "" -"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 "" +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 @@ -3274,5 +3438,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3281,5 +3445,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3287,25 +3451,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 "S" #. 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 "N" #. 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 "W" #. 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 "E" #: ../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 @@ -3328,25 +3492,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}" @@ -3354,6 +3519,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 "" @@ -3416,24 +3581,24 @@ msgstr "F" -#: ../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 "expected id >= 0. Got {0}" -#: ../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 "a primitive with id=0 can't be invisible" -#: ../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 "ID > 0 expected. Got {0}." -#: ../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 "version > 0 expected. Got {0}" -#: ../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 " @@ -3441,5 +3606,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 "" @@ -3473,6 +3638,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}." @@ -3493,5 +3658,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 @@ -3503,6 +3667,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 "" @@ -3513,135 +3676,135 @@ msgstr "parameter {0} not in range 0..{1}, got {2}" -#: ../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 "Area style way is not closed." -#: ../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 "multipolygon way ''{0}'' is not closed." -#: ../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 "Deleted member ''{0}'' in relation." -#: ../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 "Way ''{0}'' with less than two points." -#: ../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 "More than one \"from\" way found." -#: ../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 "More than one \"to\" way found." -#: ../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 "More than one \"via\" found." -#: ../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 "Unknown role ''{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 "Unknown member type for ''{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 "No \"from\" way found." -#: ../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 "No \"to\" way found." -#: ../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 "No \"via\" node or way found." -#: ../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 "The \"from\" way doesn't start or end at a \"via\" node." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../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 "The \"to\" way doesn't start or end at a \"via\" node." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "The \"from\" way doesn't start or end at the \"via\" way." -#: ../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 "The \"to\" way doesn't start or end at the \"via\" way." -#: ../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 "Style for restriction {0} not found." -#: ../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 "Intersection between ways ''{0}'' and ''{1}''." -#: ../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 "Inner way ''{0}'' is outside." -#: ../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 "No useful role ''{0}'' for Way ''{1}''." -#: ../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 "Non-Way ''{0}'' in multipolygon." -#: ../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 "No outer way for multipolygon ''{0}''." -#: ../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 "Style for inner way ''{0}'' equals multipolygon." -#: ../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 "Style for outer way ''{0}'' mismatches." -#: ../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 "untagged" -#: ../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 "text" -#: ../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 "Error: {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}" @@ -3653,5 +3816,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 @@ -3670,5 +3833,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 @@ -3688,5 +3851,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 "background" @@ -3804,6 +3967,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 "" "Could not read bookmarks from
''{0}''
Error was: {1}" @@ -3819,5 +3981,5 @@ msgstr "Do not show again" -#: ../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 @@ -3825,32 +3987,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 "incomplete" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "highway" -#: ../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 "railway" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "waterway" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "landuse" -#: ../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" @@ -3859,5 +4021,5 @@ msgstr[1] "{0} nodes" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -4109,12 +4271,12 @@ msgstr "Preference setting {0} has been removed since it is no longer used." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "File" -#: ../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 @@ -4128,19 +4290,19 @@ msgstr "Edit" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "View" -#: ../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 "Tools" -#: ../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 "Presets" -#: ../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 @@ -4151,5 +4313,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Audio" @@ -4193,29 +4355,29 @@ msgstr "scale" -#: ../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 "The geographic longitude at the mouse pointer." -#: ../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 "The name of the object at the mouse pointer." -#: ../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 "The geographic latitude at the mouse pointer." -#: ../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 "The angle between the previous and the current way segment." -#: ../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 "The (compass) heading of the line segment being drawn." -#: ../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 "The length of the new way segment being drawn." -#: ../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 " @@ -4225,9 +4387,9 @@ "this list with the mouse.
" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(no object)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "User:" @@ -4334,5 +4496,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" @@ -4341,5 +4503,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" @@ -4348,5 +4510,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" @@ -4365,5 +4527,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 @@ -4380,5 +4542,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" @@ -4453,22 +4615,22 @@ msgstr "Conflict Resolution" -#: ../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 "parameter current out of range: got {0}" -#: ../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 "list in role {0} is currently not participating in a compare pair" -#: ../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 "unexpected value of parameter \"index\". Got {0}" -#: ../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." @@ -4554,8 +4716,6 @@ #: ../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." -msgstr "" -"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 "Copy their selected elements to the end of the list of merged elements" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 @@ -4627,6 +4787,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" "Click {0} to start merging my and their entries" @@ -4635,9 +4795,9 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." -msgstr "" -"Click {0} to finish merging my and their " -"entries" +"Click {0} to finish merging my and their entries." +msgstr "" +"Click {0} to finish merging my and their entries" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 @@ -4695,9 +4855,9 @@ #, java-format msgid "" -"An error occurred while communicating with the server
Details: " -"{0}" -msgstr "" -"An error occurred while communicating with the server
Details: " -"{0}" +"An error occurred while communicating with the server
Details: {0}" +msgstr "" +"An error occurred while communicating with the server
Details: {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 @@ -4731,11 +4891,11 @@ #, java-format msgid "" -"There are {0} additional primitives referred to by relation " -"{1}
which are deleted on the server.

Do you want to undelete them " -"too?" -msgstr "" -"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 "" +"There are {0} additional primitives referred to by relation {1}" +"
which are deleted on the server.

Do you want to undelete them too?" +"" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 @@ -4887,5 +5047,5 @@ msgstr "Primitive" -#: ../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 "merged nodes not frozen yet. Can't build resolution command" @@ -5020,5 +5180,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 "Apply" @@ -5118,7 +5278,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" @@ -5128,6 +5288,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" @@ -5161,7 +5321,5 @@ msgstr "Not decided yet" -#. --- 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 "Role:" @@ -5231,6 +5389,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 msgid "Please select the values to keep for the following tags." -msgstr "" -"Please select the values to keep for the following tags." +msgstr "Please select the values to keep for the following tags." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 @@ -5251,5 +5408,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 @@ -5315,17 +5472,15 @@ #, 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." -msgstr "" -"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 "" +"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." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 @@ -5399,18 +5554,18 @@ msgstr "Filter mode" -#: ../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 "History" -#: ../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 "Display the history of all selected items." -#: ../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 "Object with history" -#: ../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 @@ -5420,13 +5575,13 @@ msgstr "Reload" -#: ../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 "Reload all currently selected objects and refresh the list." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303 msgid "Show" msgstr "Show" -#: ../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 "Display the history of the selected objects." @@ -5619,5 +5774,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 "Create a copy of this relation and open it in another editor window" @@ -5660,25 +5815,25 @@ msgstr "Zoom to selection" -#: ../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 "Sel.: Rel.:{0} / Ways:{1} / Nodes:{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 "Selection" -#: ../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 "Selection: {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 "Undock the panel" -#: ../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." @@ -5686,5 +5841,5 @@ "Close this panel. You can reopen it with the buttons in the left toolbar." -#: ../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 "Click to minimise/maximise the panel content" @@ -5747,37 +5902,37 @@ msgstr "# Objects" -#: ../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 "Edit the relation the currently selected relation member refers to" -#: ../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 "Download all child relations (recursively)" -#: ../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 "Download All Children" -#: ../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 "Download selected relations" -#: ../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 "Download Selected Children" -#: ../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 "Download relation members" -#: ../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 "Conflicts in data" -#: ../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 "" @@ -5788,70 +5943,97 @@ "loaded" -#: ../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 "Relation is deleted" -#: ../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 "Downloading relation {0}" -#: ../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 "" -"Warning: ignoring exception because task is cancelled. Exception: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}" + +#: ../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] "Download all incomplete ways and nodes in relation" +msgstr[1] "Download all incomplete ways and nodes in relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Download relation members" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "Downloading relation {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 msgid "Tags and Members" msgstr "Tags and Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Parent Relations" msgstr "Parent Relations" -#: ../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 "Child Relations" -#: ../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 "Apply Role" + +#: ../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 "Select primitives for selected relation members" + +#: ../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?" +"relation itself.
This creates circular dependencies and is discouraged." +"
How do you want to proceed with circular dependencies?" msgstr "" "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?" - -#: ../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?" + +#: ../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 "Remove them, clean up relation" -#: ../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 "Ignore them, leave relation as is" -#: ../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?" +"primitive ''{0}''

Do you really want to add another relation member?" msgstr "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

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

Do you really want to add another relation member?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 msgid "Multiple members referring to same primitive" msgstr "Multiple members referring to same primitive" -#: ../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 "" @@ -5864,5 +6046,5 @@ "''{0}''." -#: ../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" @@ -5870,5 +6052,5 @@ "Add all primitives selected in the current dataset before the first member" -#: ../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" @@ -5876,5 +6058,5 @@ "Add all primitives selected in the current dataset after the last member" -#: ../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 " @@ -5884,5 +6066,5 @@ "member" -#: ../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 " @@ -5892,15 +6074,15 @@ "member" -#: ../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 "Remove all members referring to one of the selected primitives" #. 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 "Relation Editor: Remove Selected" -#: ../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" @@ -5908,5 +6090,5 @@ "Select relation members which refer to primitives in the current selection" -#: ../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 "" @@ -5917,66 +6099,70 @@ "selection" -#: ../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 "Select primitives for selected relation members" -#: ../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 "Sort the relation members" -#. 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 "Sport" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 msgid "Relation Editor: Sort" msgstr "Relation Editor: Sort" -#: ../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 "Move the currently selected members up" #. 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 "Relation Editor: Move Up" -#: ../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 "Move the currently selected members down" #. 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 "Relation Editor: Move Down" -#: ../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 "Remove the currently selected members from this relation" #. 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 "Relation Editor: Remove" -#: ../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 "Delete the currently edited relation" -#: ../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 "Yes, create a conflict and close" -#: ../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 "No, continue editing" +#: ../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 " @@ -5988,56 +6174,62 @@ "conflict and close the editor?" -#: ../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 "Conflict in data" -#: ../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 "" -"Layer ''{0}'' already has a conflict for " -"primitive
''{1}''.
Please resolve this conflict first, then try " -"again." - -#: ../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 "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 msgid "Apply the current updates" msgstr "Apply the current updates" -#: ../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 "Apply the updates and close the dialog" -#: ../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 "Cancel the updates and close the dialog" -#: ../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 "Add an empty tag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 -msgid "Download all incomplete ways and nodes in relation" -msgstr "Download all incomplete ways and nodes in relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#, fuzzy +msgid "Download all incomplete members" +msgstr "Download relation members" + +#: ../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 "Download Members" -#: ../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 "Relation Editor: Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#, fuzzy +msgid "Download selected incomplete members" +msgstr "Download relation members" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 msgid "Sets a role for the selected members" msgstr "Sets a role for the selected members" -#: ../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 "Apply Role" -#: ../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 "" @@ -6050,41 +6242,34 @@ "new role?" -#: ../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 "Yes, apply it" -#: ../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 "No, don't apply" -#: ../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 "Confirm empty role" -#: ../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 "Edit the relation the currently selected relation member refers to" -#. 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 "Zoom to" -#: ../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 "Zooming disabled because layer of this relation is not active" -#: ../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 "Zooming disabled because there is no selected member" @@ -6106,6 +6291,5 @@ #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" -msgstr "" -"Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63 @@ -6125,19 +6309,19 @@ msgstr "Edit the currently selected relation" -#: ../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 "Apply Changes" -#: ../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 "Create new relation in layer ''{0}''" -#: ../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 "Edit new relation in layer ''{0}''" -#: ../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}''" @@ -6149,6 +6333,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 "" "Warning: ignoring exception because task was cancelled. Exception was: " @@ -6329,7 +6512,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 "" @@ -7102,5 +7284,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 @@ -7340,6 +7522,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 "" @@ -7349,6 +7531,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 "" @@ -7614,13 +7796,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 "Changeset info" -#: ../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 "Launch browser with information about the changeset" -#: ../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}" @@ -7721,6 +7903,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 "" "Layer ''{0}'' has modifications which should be uploaded to the server." @@ -7812,6 +7993,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] "" "{0} layer needs saving but has no associated file.
Either select a " @@ -7819,6 +8000,6 @@ msgstr[1] "" "{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:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 @@ -7830,6 +8011,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 " @@ -7838,6 +8019,6 @@ msgstr[0] "" "{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:" msgstr[1] "" "{0} layers need saving but have associated files
which can't be " @@ -7890,5 +8071,5 @@ msgstr "Preparing layer ''{0}'' for upload ..." -#: ../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 " @@ -7898,5 +8079,5 @@ "cancelled or has failed." -#: ../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 "Incomplete upload and/or save" @@ -7969,40 +8150,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 "Upload" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 msgid "Settings" msgstr "Settings" -#: ../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 "Tags of new changeset" -#: ../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 "Objects to add:" -#: ../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 "Objects to modify:" -#: ../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 "Objects to delete:" -#: ../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:" @@ -8011,5 +8192,5 @@ msgstr[1] "{0} objects to add:" -#: ../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:" @@ -8018,5 +8199,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:" @@ -8025,70 +8206,67 @@ msgstr[1] "{0} objects to delete:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 msgid "Upload Changes" msgstr "Upload Changes" -#: ../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 "Upload the changed primitives" -#: ../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 "Please enter a comment for this upload changeset (min. 3 characters)" -#: ../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 "Illegal upload comment" -#: ../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 "Please enter the desired coordinates first." + +#: ../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 "Cancel the upload and resume editing" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 -msgid "Upload all changes in one request" -msgstr "Upload all changes in one request" - -#: ../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 "" -"Enable to upload all changes in one request, disable to use one request per " -"changed primitive" - -#: ../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 "Provide a brief comment for the changes you are uploading:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../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 "Open a new changeset" -#: ../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 "Open a new changeset and use it in the next upload" -#: ../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 "Use an open changeset" -#: ../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 "Upload data to an already opened changeset" -#: ../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 "Close changeset after upload" -#: ../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 "Select to close the changeset after the next upload" -#: ../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}" @@ -8096,16 +8274,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 "Load the list of your open changesets from the server" -#: ../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 "Close the currently selected open changeset" -#: ../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}." @@ -8113,6 +8291,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 "" @@ -8123,5 +8301,5 @@ "primitive and retrying to upload." -#: ../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 "Preparing primitives to upload ..." @@ -8155,111 +8333,57 @@ msgstr "Continue uploading" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Images for {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "Read GPX..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "No time for point {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 "Cannot read time \"{0}\" from point {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 "Reading {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "No images with readable timestamps found." - -#: ../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 "Geotagged Images" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "GPS start: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "GPS end: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "current delta: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "timezone difference: " - -#: ../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] "image" -msgstr[1] "images" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} within the track." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Sync clock" - -#: ../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 "JPEG images (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "The date in file \"{0}\" could not be parsed." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "There is no EXIF time within the file \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Image" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "GPS unit timezone (difference to photo)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Synchronise Time with GPS Unit" - -#: ../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 "Time entered could not be parsed." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, fuzzy, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "Warning: failed to persist preferences to ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 +#, fuzzy +msgid "Upload data in one request" +msgstr "Upload all changes in one request" + +#: ../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 +#, fuzzy +msgid "(1 request)" +msgstr "Bad Request" + +#: ../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} metres" +msgstr[1] "{0} metres" + +#: ../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 "Please enter a filter string." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 +#, fuzzy, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "File ''{0}'' is not writable. Please enter another file name." + +#: ../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 @@ -8267,30 +8391,30 @@ msgstr "gps point" -#: ../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 "Customise line drawing" -#: ../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 "Use global settings." -#: ../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 "Draw lines between points for this layer." -#: ../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 "Do not draw lines between points for this layer." -#: ../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 "Select line drawing options" -#: ../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 @@ -8298,5 +8422,5 @@ msgstr "Customise Colour" -#: ../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 @@ -8305,5 +8429,5 @@ msgstr "Default" -#: ../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 @@ -8312,58 +8436,63 @@ msgstr "Choose a colour" -#: ../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 "Markers From Named Points" -#: ../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 "Named Trackpoints from {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215 msgid "Import Audio" msgstr "Import Audio" -#: ../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 "Wave Audio files (*.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 "Audio markers from {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 "Import images" -#: ../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 "JPEG images (*.jpg)" + +#: ../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 "Name: {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 @@ -8371,5 +8500,5 @@ msgstr "Description: {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" @@ -8379,5 +8508,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 @@ -8385,22 +8514,17 @@ msgstr "Description" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 msgid "Timespan" msgstr "Timespan" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 msgid "Length" msgstr "Length" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 -msgid "URL" -msgstr "URL" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443 msgid "Length: " msgstr "Length: " -#: ../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, " @@ -8409,5 +8533,5 @@ msgstr[1] "{0} routes, " -#: ../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" @@ -8416,24 +8540,24 @@ msgstr[1] "{0} waypoints" -#: ../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 "Convert to data layer" -#: ../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 "" -"Upload of unprocessed GPS data as map data is considered " -"harmful.
If you want to upload traces, look here:" - -#: ../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 "" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" + +#: ../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 @@ -8443,29 +8567,29 @@ msgstr "Converted from: {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 "Download from OSM along this track" -#: ../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 "Download everything within:" -#: ../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} metres" -#: ../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 "Maximum area per request:" -#: ../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} sq km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8476,9 +8600,9 @@ "wish
to continue?" -#: ../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 "No GPX track available in layer to associate audio with." -#: ../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 " @@ -8488,5 +8612,5 @@ "the end were omitted or moved to the start." -#: ../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 " @@ -8496,23 +8620,23 @@ "time were omitted." -#: ../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 "Data Layer {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 "outside downloaded area" -#: ../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 "version {0}" -#: ../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 "Warning: mixing 0.6 and 0.5 data results in version 0.5" -#: ../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." @@ -8521,5 +8645,5 @@ msgstr[1] "There were {0} conflicts detected." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 #, java-format msgid "" @@ -8533,5 +8657,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 "" @@ -8544,11 +8668,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" @@ -8557,32 +8681,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} consists of:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 msgid "unset" msgstr "unset" -#: ../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 "API version: {0}" -#: ../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 "Convert to GPX layer" -#: ../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 "" @@ -8590,9 +8714,9 @@ #: ../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:" -msgstr "" -"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 "" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 @@ -8630,4 +8754,360 @@ msgstr[1] "{0} points" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "GPX Files (*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "File {0} is loaded yet under the name \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#, java-format +msgid "Error while parsing {0}" +msgstr "Error while parsing {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Could not read \"{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 "" +"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
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Photo time (from exif):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "Gps time (read from the above photo): " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [dd/mm/yyyy hh:mm:ss]" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +msgid "I'm in the timezone of: " +msgstr "I'm in the timezone of: " + +#: ../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 "No date" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "Open an other photo" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +msgid "Synchronize time from a photo of the GPS receiver" +msgstr "Synchronise time from a photo of the GPS receiver" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"Error while parsing the date.\n" +"Please use the requested format" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "Invalid date" + +#: ../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 "GPX track: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Open another GPX trace" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +msgid "Timezone: " +msgstr "Timezone: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +msgid "Offset:" +msgstr "Offset:" + +#: ../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 "" +"I can take a picture of my GPS receiver.
Can this help?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 +msgid "Update position for: " +msgstr "Update position for: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 +msgid "All images" +msgstr "All images" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 +msgid "Images with no exif position" +msgstr "Images with no exif position" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 +msgid "Not yet tagged images" +msgstr "Not yet tagged images" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +msgid "Correlate images with GPX track" +msgstr "Correlate images with GPX track" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Correlate" +msgstr "Correlate" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Auto-Guess" +msgstr "Auto-Guess" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +msgid "You should select a GPX track" +msgstr "You should select a GPX track" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "No selected GPX track" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Error while parsing timezone.\n" +"Expected format: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +msgid "Invalid timezone" +msgstr "Invalid timezone" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Error while parsing offset.\n" +"Expected format: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +msgid "Invalid offset" +msgstr "Invalid offset" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "Found {0} matches of {1} in GPX track {2}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "GPX Track loaded" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 +msgid "The selected photos don't contain time information." +msgstr "The selected photos don't contain time information." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 +msgid "Photos don't contain time information" +msgstr "Photos don't contain time information" + +#: ../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 "" +"The selected GPX track doesn't contain timestamps. Please select another one." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "GPX Track has no time information" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "Timezone: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "Minutes: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "Seconds: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Matched {0} of {1} photos to GPX track." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "(Time difference of {0} days)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "Offset between track and photos: {0}m {1}s" + +#: ../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 "" +"An error occurred while trying to match the photos to the GPX track. You can " +"adjust the sliders to manually match the photos." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 +msgid "Matching photos to track failed" +msgstr "Matching photos to track failed" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +msgid "Adjust timezone and offset" +msgstr "Adjust timezone and offset" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +msgid "Default Values" +msgstr "Default Values" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +msgid "Extracting GPS locations from EXIF" +msgstr "Extracting GPS locations from EXIF" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +msgid "Starting directory scan" +msgstr "Starting directory scan" + +#: ../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 "Read photos..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "Reading {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 "Unable to get canonical path for directory {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "Scanning directory {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "Found null file in directory {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Error while getting files from directory {0}\n" + +#: ../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 "Geotagged Images" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "Correlate to GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "image" +msgstr[1] "images" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "{0} were found to be gps tagged." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +msgid "No image" +msgstr "No image" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "Loading {0}" + +#: ../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 "Error on file {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Display geotagged photos" + +#: ../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 "Previous" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Remove photo from layer" + +#: ../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 "Next" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "Centre view" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +msgid "Zoom best fit and 1:1" +msgstr "Zoom best fit and 1:1" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#, java-format +msgid "" +"\n" +"Altitude: {0} m" +msgstr "" +"\n" +"Altitude: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8946,5 +9426,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 @@ -9140,6 +9620,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 "" "Draw the direction arrows using table lookups instead of complex maths." @@ -9205,8 +9684,6 @@ #. antialiasing #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242 -msgid "" -"Apply antialiasing to the map view resulting in a smoother appearance." -msgstr "" -"Apply antialiasing to the map view resulting in a smoother appearance." +msgid "Apply antialiasing to the map view resulting in a smoother appearance." +msgstr "Apply antialiasing to the map view resulting in a smoother appearance." #. downloaded area @@ -9273,19 +9750,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 "Look and Feel" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Language" + +#: ../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 "Default (Auto determined)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Language" - -#: ../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 @@ -9546,6 +10023,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 "" @@ -9610,12 +10087,12 @@ "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 "" "

Furthermore, the shortcuts are activated when the actions are assigned to " "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." +"

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:170 @@ -9627,9 +10104,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 "" "

You may notice that the key selection list on the next page lists all " @@ -9639,9 +10115,9 @@ "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, '.'/Full Stop 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, '.'/Full Stop 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..." +"

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177 @@ -9669,9 +10145,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

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

" -msgstr "" -"

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

" +"

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

" +msgstr "" +"

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

" #. scroll up @@ -9763,5 +10239,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 "More information about this feature" @@ -9848,5 +10324,5 @@ msgstr "Downloading points {0} to {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 @@ -9854,5 +10330,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9974,15 +10450,13 @@ msgstr "Unknown mode {0}." -#: ../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 "" -"no primitive with id {0} in local dataset. Can't infer primitive type" - -#: ../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 "no primitive with id {0} in local dataset. Can't infer primitive type" + +#: ../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 @@ -10010,20 +10484,20 @@ msgstr "Server replied with response code 404 for id {0}. Skipping." -#: ../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 "Fetching a package of nodes from ''{0}''" -#: ../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 "Fetching a package of ways from ''{0}''" -#: ../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 "Fetching a package of relations from ''{0}''" -#: ../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 " @@ -10032,4 +10506,11 @@ "Server replied with response code 404, retrying with an individual request " "for each primitive" + +#: ../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] "Downloading points {0} to {1}..." +msgstr[1] "Downloading points {0} to {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10071,29 +10552,29 @@ msgstr "preference ''{0}'' missing. Can't initialize OsmApi" -#: ../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 "This version of JOSM is incompatible with the configured server." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174 -#, java-format -msgid "" +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#, fuzzy, java-format +msgid "" +"It supports protocol version 0.6, while the server says it supports {0} to " +"{1}." +msgstr "" "It supports protocol versions 0.5 and 0.6, while the server says it supports " "{0} to {1}." -msgstr "" -"It supports protocol versions 0.5 and 0.6, while the server says it supports " -"{0} to {1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Communications with {0} established using protocol version {1}" -#: ../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 "unexpected format of id replied by the server, got ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 #, java-format msgid "" @@ -10102,66 +10583,66 @@ "unexpected format of new version of modified primitive ''{0}'', got ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 msgid "Creating changeset..." msgstr "Creating changeset..." -#: ../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 "Successfully opened changeset {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 msgid "Updating changeset..." msgstr "Updating changeset..." -#: ../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 "Updating changeset {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 msgid "Closing changeset..." msgstr "Closing changeset..." -#: ../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 "No changeset present for diff upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "Preparing..." msgstr "Preparing..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Uploading..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Waiting 10 seconds ... " msgstr "Waiting 10 seconds ... " -#: ../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 "OK - trying again." -#: ../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 "Starting retry {0} of {1}." -#: ../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}." @@ -10196,5 +10677,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}''." @@ -10221,5 +10702,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}." @@ -10227,5 +10708,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}" @@ -10238,5 +10719,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}''." @@ -10295,11 +10776,11 @@ #: ../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." -msgstr "" -"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 "" +"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." #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 @@ -10326,9 +10807,9 @@ #, java-format msgid "" -"An error occurred while restoring backup file.
Error " -"is:
{0}" -msgstr "" -"An error occurred while restoring backup file.
Error is: " -"
{0}" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" +"An error occurred while restoring backup file.
Error is:
{0}" #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 @@ -10398,46 +10879,45 @@ msgstr "File \"{0}\" does not exist" -#: ../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 "" @@ -10445,19 +10925,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 "Incomplete specification with ref=0" -#: ../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 "Illegal object with 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 "" @@ -10467,8 +10947,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 "" @@ -10478,25 +10958,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 "" @@ -10504,5 +10984,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10511,5 +10991,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10517,5 +10997,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10524,13 +11004,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 "Prepare OSM data..." -#: ../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 "" @@ -10583,4 +11063,10 @@ msgid "Contacting Server..." msgstr "Contacting Server..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 +#, fuzzy, java-format +msgid "Expected value > 0 for parameter ''{0}'', got {1}" +msgstr "unexpected value of parameter \"index\". Got {0}" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10619,42 +11105,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 +#, fuzzy, java-format +msgid "Value >0 expected for parameter ''{0}'', got {1}" +msgstr "unexpected value of parameter \"index\". Got {0}" + +#: ../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 "" @@ -10696,17 +11183,27 @@ msgstr "Downloading Plugin {0}..." -#: ../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 "Delete {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Error deleting plugin file: {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 msgid "Skip download" msgstr "Skip download" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Download Plugin" msgstr "Download Plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Skip Download" msgstr "Skip Download" -#: ../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}." @@ -10718,20 +11215,18 @@ msgstr "An error occurred in plugin {0}" -#: ../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 "" -"Loading of {0} plugin was requested. This plugin is no longer required." - -#: ../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" @@ -10740,50 +11235,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 "Last plugin update more than {0} days ago." -#: ../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 "Plugin {0} requires JOSM update to version {1}." -#: ../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 "Plugin {0} is required by plugin {1} but was not found." -#: ../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 "Plugin not found: {0}." -#: ../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 "Could not load plugin {0}. Delete from preferences?" -#: ../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 "Disable plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Keep plugin" msgstr "Keep plugin" -#: ../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 " @@ -10793,9 +11288,9 @@ "overwrite the existing ones." -#: ../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 "" @@ -10804,10 +11299,10 @@ "An unexpected exception occurred that may have come from the ''{0}'' plugin." -#: ../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 "According to the information within the plugin, the author is {0}." -#: ../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." @@ -10815,9 +11310,9 @@ "Try updating to the newest version of this plugin before reporting a bug." -#: ../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 "Should the plugin be disabled?" -#: ../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 " @@ -10827,13 +11322,13 @@ "unload the plugin." -#: ../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 "The plugin could not be removed. Probably it was already disabled" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:386 msgid "Plugin information" msgstr "Plugin information" -#: ../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" @@ -10952,6 +11447,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 "" @@ -10989,10 +11484,10 @@ 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 "" "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}" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 @@ -11058,7 +11553,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 "" @@ -11070,7 +11564,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 "" @@ -11105,6 +11599,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 "" @@ -11370,5 +11864,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" @@ -11383,12 +11877,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 "Odd" -#: ../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 @@ -11396,458 +11888,144 @@ msgstr "Even" -#: ../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 "Number" + +#. 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 "natural" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "Activate" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Rental" + +#: ../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 "inner segment" + +#: ../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 "AgPifoJ - Geotagged pictures" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "Display geotagged photos" - -#: ../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 "Previous" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Remove photo from layer" - -#: ../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 "Next" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "Centre view" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102 -msgid "Zoom best fit and 1:1" -msgstr "Zoom best fit and 1:1" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 -#, java-format -msgid "" -"\n" -"Altitude: {0} m" -msgstr "" -"\n" -"Altitude: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/h" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "Extracting GPS locations from EXIF" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121 -msgid "Starting directory scan" -msgstr "Starting directory scan" - -#: ../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 "Read photos..." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:186 -#, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "Unable to get canonical path for directory {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "Scanning directory {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "Found null file in directory {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Error while getting files from directory {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "Correlate to GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} were found to be gps tagged." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "Open images with AgPifoJ..." - -#: ../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 "Load set of images as a new layer." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "GPX Files (*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "File {0} is loaded yet under the name \"{1}\"" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#, java-format -msgid "Error while parsing {0}" -msgstr "Error while parsing {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Could not read \"{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 "" -"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
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Photo time (from exif):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "Gps time (read from the above photo): " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [dd/mm/yyyy hh:mm:ss]" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 -msgid "I'm in the timezone of: " -msgstr "I'm in the timezone of: " - -#: ../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 "No date" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "Open an other photo" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 -msgid "Synchronize time from a photo of the GPS receiver" -msgstr "Synchronise time from a photo of the GPS receiver" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"Error while parsing the date.\n" -"Please use the requested format" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "Invalid date" - -#: ../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 "GPX track: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Open another GPX trace" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -msgid "Timezone: " -msgstr "Timezone: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 -msgid "Offset:" -msgstr "Offset:" - -#: ../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 "" -"I can take a picture of my GPS receiver.
Can this help?" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Update position for: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "All images" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Images with no exif position" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Not yet tagged images" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 -msgid "Correlate images with GPX track" -msgstr "Correlate images with GPX track" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Correlate" -msgstr "Correlate" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Auto-Guess" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "You should select a GPX track" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "No selected GPX track" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Error while parsing timezone.\n" -"Expected format: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Invalid timezone" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Error while parsing offset.\n" -"Expected format: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Invalid offset" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Found {0} matches of {1} in GPX track {2}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX Track loaded" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "The selected photos don't contain time information." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Photos don't contain time information" - -#: ../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 "" -"The selected GPX track doesn't contain timestamps. Please select another one." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX Track has no time information" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Timezone: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minutes: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Seconds: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Matched {0} of {1} photos to GPX track." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Time difference of {0} days)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Offset between track and photos: {0}m {1}s" - -#: ../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 "" -"An error occurred while trying to match the photos to the GPX track. You can " -"adjust the sliders to manually match the photos." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "Matching photos to track failed" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Adjust timezone and offset" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Default Values" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433 -msgid "No image" -msgstr "No image" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "Loading {0}" - -#: ../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 "Error on file {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11995,19 +12173,17 @@ #: ../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." -msgstr "" -"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 "" +"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." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 @@ -12321,12 +12497,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] "Simplify Way (remove {0} node)" -msgstr[1] "Simplify Way (remove {0} nodes)" - #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 @@ -12442,14 +12610,14 @@ msgstr "Colour Schemes" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 +#: ../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 "Split area" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 msgid "Splits an area by an untagged way." msgstr "Splits an area by an untagged way." -#: ../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 " @@ -12763,4 +12931,8 @@ msgstr "Open images with ImageWayPoint" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Load set of images as a new layer." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -12804,18 +12976,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 "Running vertex reduction..." -#: ../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 "Running Douglas-Peucker approximation..." -#: ../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 "Removing duplicate nodes..." -#: ../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" @@ -12864,7 +13036,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12874,5 +13046,5 @@ #. 50000 #. -#. +#. #. #. @@ -12882,5 +13054,5 @@ #. 50000 #. -#. +#. #. #. @@ -12889,5 +13061,5 @@ #. 50000 #. -#. +#. #. #. @@ -12897,5 +13069,5 @@ #. 50000 #. -#. +#. #. #. @@ -12973,8 +13145,6 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69 -msgid "" -"Maximum number of segments allowed in each generated way. Default 250." -msgstr "" -"Maximum number of segments allowed in each generated way. Default 250." +msgid "Maximum number of segments allowed in each generated way. Default 250." +msgstr "Maximum number of segments allowed in each generated way. Default 250." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70 @@ -12996,11 +13166,9 @@ #: ../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." -msgstr "" -"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 "" +"Accuracy of Douglas-Peucker line simplification, measured in degrees." +"
Lower values give more nodes, and more accurate lines. Default 0.0003." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 @@ -13062,20 +13230,19 @@ msgstr "Could not acquire image" -#: ../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 "Connecting" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Connected" -#. 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 "Not connected" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "Connection Failed" @@ -13297,8 +13464,6 @@ #: ../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" -msgstr "" -"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 "Header contains several values and cannot be mapped to a single string" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96 @@ -13382,9 +13547,10 @@ msgstr "Unknown file extension: {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 "Osmarender" -#: ../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 " @@ -13394,9 +13560,5 @@ "the preferences." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "osmarender options" - -#: ../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 "Firefox executable" @@ -13773,17 +13935,17 @@ msgstr "You have to specify tagging preset sources in the preferences first." -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" msgstr "Reverse a terrace" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37 msgid "Reverses house numbers on a terrace." msgstr "Reverses house numbers on a terrace." -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 msgid "Reverse a Terrace" msgstr "Reverse a Terrace" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110 msgid "Reverse Terrace" msgstr "Reverse Terrace" @@ -13827,167 +13989,4 @@ msgid "Optional" msgstr "Optional" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "Join overlapping Areas" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Joins areas that overlap each other" -msgstr "Joins areas that overlap each other" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 -msgid "Only up to two areas can be joined at the moment." -msgstr "Only up to two areas can be joined at the moment." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 -#, java-format -msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "\"{0}\" is not closed and therefore can't be joined." - -#: ../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 "" -"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?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 -msgid "Please abort if you are not sure" -msgstr "Please abort if you are not sure" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 -msgid "Please select at least one closed way the should be joined." -msgstr "Please select at least one closed way the should be joined." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175 -msgid "No intersection found. Nothing was changed." -msgstr "No intersection found. Nothing was changed." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197 -msgid "Added node on all intersections" -msgstr "Added node on all intersections" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221 -msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "Delete Ways that are not part of an inner multipolygon" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226 -msgid "Fix relations" -msgstr "Fix relations" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 -msgid "Joined self-overlapping area" -msgstr "Joined self-overlapping area" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 -msgid "Joined overlapping areas" -msgstr "Joined overlapping areas" - -#: ../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 "" -"Some of the ways were part of relations that have been modified. Please " -"verify no errors have been introduced." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 -msgid "Enter values for all conflicts." -msgstr "Enter values for all conflicts." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Solve Conflicts" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312 -msgid "Fix tag conflicts" -msgstr "Fix tag conflicts" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462 -msgid "Removed Element from Relations" -msgstr "Removed Element from Relations" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571 -msgid "Join Areas: Remove Short Ways" -msgstr "Join Areas: Remove Short Ways" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587 -msgid "Closed Way" -msgstr "Closed Way" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854 -msgid "Remove tags from inner ways" -msgstr "Remove tags from inner ways" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883 -msgid "Join Areas Function" -msgstr "Join Areas Function" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Jump To Position" -msgstr "Jump To Position" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Opens a dialog that allows to jump to a specific location" -msgstr "Opens a dialog that allows to jump to a specific location" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 -msgid "Enter Lat/Lon to jump to position." -msgstr "Enter Lat/Lon to jump to position." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 -msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "You can also paste an URL from www.openstreetmap.org" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 -msgid "Zoom (in metres)" -msgstr "Zoom (in metres)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -msgid "Jump there" -msgstr "Jump there" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 -msgid "Jump to Position" -msgstr "Jump to Position" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Could not parse Latitude, Longitude or Zoom. Please check." -msgstr "Could not parse Latitude, Longitude or Zoom. Please check." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Unable to parse Lon/Lat" -msgstr "Unable to parse Lon/Lat" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Simplify Way" -msgstr "Simplify Way" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Delete unnecessary nodes from a way." - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "Please select at least one way to simplify." - -#: ../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] "" -"The selection contains {0} way. Are you sure you want to simplify it?" -msgstr[1] "" -"The selection contains {0} ways. Are you sure you want to simplify them all?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "Are you sure?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14087,5 +14086,5 @@ msgstr "validation other" -#: ../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}" @@ -14138,34 +14137,34 @@ msgstr "Ignore the selected errors next time." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Whole group" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Single elements" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Nothing" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Ignore whole group or individual elements?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 msgid "Ignoring elements" msgstr "Ignoring elements" -#: ../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 "" @@ -14214,18 +14213,18 @@ msgstr "Crossing ways" -#: ../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 "Duplicated nodes" -#: ../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 "This test checks that there are no nodes at the very same location." -#: ../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 "Confirmation" @@ -14440,6 +14439,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600 msgid "Validate that property keys are valid checking against list of words." -msgstr "" -"Validate that property keys are valid checking against list of words." +msgstr "Validate that property keys are valid checking against list of words." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 @@ -14461,11 +14459,9 @@ #: ../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." -msgstr "" -"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 "" +"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." +"org/index.php/User:JLS/speller) or tag checking data files." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 @@ -14607,5 +14603,5 @@ #. 50000 #. -#. +#. #. #. @@ -14613,5 +14609,5 @@ #. #. -#. +#. #. #. @@ -14621,5 +14617,5 @@ #. 50000 #. -#. +#. #. #. @@ -14628,5 +14624,5 @@ #. 50000 #. -#. +#. #. #. @@ -14635,5 +14631,5 @@ #. 50000 #. -#. +#. #. #. @@ -14642,5 +14638,5 @@ #. 50000 #. -#. +#. #. #. @@ -14649,5 +14645,5 @@ #. 50000 #. -#. +#. #. #. @@ -14656,9 +14652,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14703,5 +14699,5 @@ #. 50000 #. -#. +#. #. #. @@ -14836,14 +14832,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 " @@ -14852,14 +14848,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 "" @@ -14868,5 +14864,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 "" @@ -14878,13 +14874,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." @@ -15047,50 +15043,50 @@ "The requested area is too big. Please zoom in a little, or change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "Download visible tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "Change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Reload erroneous tiles" msgstr "Reload erroneous tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:369 msgid "Save WMS layer to file" msgstr "Save WMS layer to file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "Save WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "Load WMS layer from file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "Load WMS layer" -#: ../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 "Unsupported WMS file version; found {0}, expected {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "File Format Error" msgstr "File Format Error" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "Error loading file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -15166,5 +15162,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 "" @@ -15206,23 +15202,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 "" -"Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -"import EXIF geotagged pictures." - -#. Plugin cadastre-fr -#: build/trans_plugins.java:7 msgid "A special handler for the French land registry WMS server." msgstr "A special handler for the French land registry WMS server." #. Plugin colorscheme -#: build/trans_plugins.java:9 +#: build/trans_plugins.java:7 msgid "" "Allows the user to create different color schemes and to switch between " @@ -15239,22 +15228,22 @@ #. Plugin Create_grid_of_ways -#: build/trans_plugins.java:11 +#: build/trans_plugins.java:9 msgid "Create a grid of ways." msgstr "Create a grid of ways." #. Plugin czechaddress +#: build/trans_plugins.java:11 +msgid "" +"Creating and handling address nodes and buildings within Czech Republic." +msgstr "" +"Creating and handling address nodes and buildings within Czech Republic." + +#. Plugin dataimport #: build/trans_plugins.java:13 -msgid "" -"Creating and handling address nodes and buildings within Czech Republic." -msgstr "" -"Creating and handling address nodes and buildings within Czech Republic." - -#. Plugin dataimport -#: build/trans_plugins.java:15 msgid "Allows to import various file formats into JOSM directly." msgstr "Allows to import various file formats into JOSM directly." #. Plugin DirectUpload -#: build/trans_plugins.java:17 +#: build/trans_plugins.java:15 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " @@ -15265,10 +15254,10 @@ #. Plugin Duplicate-Way -#: build/trans_plugins.java:19 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "Duplicate Ways with an offset" #. Plugin editgpx -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -15279,22 +15268,20 @@ #. Plugin globalsat +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." +msgstr "Download GPS points from Globalsat dg100 data logger directly in JOSM." + +#. Plugin graphview #: build/trans_plugins.java:23 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." -msgstr "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." - -#. Plugin graphview -#: build/trans_plugins.java:25 msgid "Visualizes routing information as a routing graph." msgstr "Visualizes routing information as a routing graph." #. Plugin grid -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Provide a background layer that displays a map grid" #. Plugin ImageWayPoint -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -15307,17 +15294,17 @@ #. Plugin lakewalker -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Helps vectorising WMS images." #. Plugin livegps +#: build/trans_plugins.java:31 +msgid "" +"Support live GPS input (moving dot) through a connection to gpsd server." +msgstr "" +"Support live GPS input (moving dot) through a connection to gpsd server." + +#. Plugin measurement #: build/trans_plugins.java:33 -msgid "" -"Support live GPS input (moving dot) through a connection to gpsd server." -msgstr "" -"Support live GPS input (moving dot) through a connection to gpsd server." - -#. Plugin measurement -#: build/trans_plugins.java:35 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -15330,10 +15317,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 " @@ -15342,5 +15329,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 " @@ -15353,29 +15340,29 @@ #. Plugin openlayers -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:41 msgid "Displays an OpenLayers background image" msgstr "Displays an OpenLayers background image" #. Plugin openstreetbugs -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:43 msgid "Imports issues from OpenStreetBugs" msgstr "Imports issues from OpenStreetBugs" #. Plugin openvisible +#: build/trans_plugins.java:45 +msgid "" +"Allows opening gpx/osm files that intersect the currently visible screen area" +msgstr "" +"Allows opening gpx/osm files that intersect the currently visible screen area" + +#. Plugin osmarender #: build/trans_plugins.java:47 msgid "" -"Allows opening gpx/osm files that intersect the currently visible screen area" -msgstr "" -"Allows opening gpx/osm files that intersect the currently visible screen area" - -#. Plugin osmarender +"Launches FireFox to display the current visible screen as a nice SVG image." +msgstr "" +"Launches FireFox to display the current visible screen as a nice SVG image." + +#. Plugin PicLayer #: build/trans_plugins.java:49 -msgid "" -"Launches FireFox to display the current visible screen as a nice SVG image." -msgstr "" -"Launches FireFox to display the current visible screen as a nice SVG image." - -#. Plugin PicLayer -#: build/trans_plugins.java:51 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -15386,15 +15373,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:51 msgid "The great JGoodies Plastic Look and Feel." msgstr "The great JGoodies Plastic Look and Feel." #. Plugin remotecontrol -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:53 msgid "Let other applications send commands to JOSM." msgstr "Let other applications send commands to JOSM." #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15405,10 +15392,10 @@ #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:57 msgid "Provides routing capabilities." msgstr "Provides routing capabilities." #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:59 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -15419,15 +15406,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:61 msgid "Allow adding markers/nodes on current gps positions." msgstr "Allow adding markers/nodes on current gps positions." #. Plugin tageditor -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:63 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Provides a dialog for editing tags in a tabular grid." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:65 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -15440,19 +15427,10 @@ #. Plugin terracer -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:67 msgid "Make terraced houses out of single blocks." msgstr "Make terraced houses out of single blocks." -#. 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 "" -"Several utilities that make your life easier: e.g. simplify way, join areas, " -"jump to position." - #. Plugin validator -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -15463,5 +15441,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15472,10 +15450,10 @@ #. Plugin waydownloader -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "Easy downloading along a long set of interconnected ways" #. Plugin wmsplugin -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -16529,8 +16507,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16727,5 +16705,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16735,5 +16713,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16752,5 +16730,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16760,5 +16738,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16777,5 +16755,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16785,5 +16763,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16802,5 +16780,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16810,5 +16788,5 @@ #. 300000 #. -#. +#. #. #. @@ -16823,5 +16801,5 @@ #. 300000 #. -#. +#. #. #. @@ -16839,5 +16817,5 @@ #. 50000 #. -#. +#. #. #. @@ -16855,5 +16833,5 @@ #. 40000 #. -#. +#. #. #. @@ -16862,5 +16840,5 @@ #. 40000 #. -#. +#. #. #. @@ -16870,5 +16848,5 @@ #. 50000 #. -#. +#. #. #. @@ -16888,5 +16866,5 @@ #. 50000 #. -#. +#. #. #. @@ -16895,5 +16873,5 @@ #. 50000 #. -#. +#. #. #. @@ -16903,5 +16881,5 @@ #. 50000 #. -#. +#. #. #. @@ -16951,7 +16929,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17650,5 +17628,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17687,5 +17665,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17781,5 +17759,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17936,5 +17914,5 @@ #. 50000 #. -#. +#. #. #. @@ -19321,5 +19299,5 @@ #. 30000 #. -#. +#. #. #. @@ -19329,5 +19307,5 @@ #. 40000 #. -#. +#. #. #. @@ -19337,5 +19315,5 @@ #. 20000 #. -#. +#. #. #. @@ -19345,5 +19323,5 @@ #. 40000 #. -#. +#. #. #. @@ -19701,7 +19679,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19711,5 +19689,5 @@ #. 50000 #. -#. +#. #. #. @@ -19719,5 +19697,5 @@ #. 50000 #. -#. +#. #. #. @@ -19727,5 +19705,5 @@ #. 50000 #. -#. +#. #. #. @@ -19735,5 +19713,5 @@ #. 50000 #. -#. +#. #. #. @@ -19743,5 +19721,5 @@ #. 50000 #. -#. +#. #. #. @@ -19751,5 +19729,5 @@ #. 50000 #. -#. +#. #. #. @@ -19759,5 +19737,5 @@ #. 50000 #. -#. +#. #. #. @@ -19767,5 +19745,5 @@ #. 50000 #. -#. +#. #. #. @@ -19775,5 +19753,5 @@ #. 50000 #. -#. +#. #. #. @@ -19783,5 +19761,5 @@ #. 50000 #. -#. +#. #. #. @@ -19791,5 +19769,5 @@ #. 50000 #. -#. +#. #. #. @@ -19799,5 +19777,5 @@ #. 50000 #. -#. +#. #. #. @@ -19807,5 +19785,5 @@ #. 50000 #. -#. +#. #. #. @@ -19815,5 +19793,5 @@ #. 50000 #. -#. +#. #. #. @@ -19823,5 +19801,5 @@ #. 50000 #. -#. +#. #. #. @@ -19831,5 +19809,5 @@ #. 50000 #. -#. +#. #. #. @@ -19839,5 +19817,5 @@ #. 50000 #. -#. +#. #. #. @@ -19847,5 +19825,5 @@ #. 50000 #. -#. +#. #. #. @@ -19855,5 +19833,5 @@ #. 50000 #. -#. +#. #. #. @@ -19863,5 +19841,5 @@ #. 50000 #. -#. +#. #. #. @@ -19871,5 +19849,5 @@ #. 50000 #. -#. +#. #. #. @@ -19879,5 +19857,5 @@ #. 50000 #. -#. +#. #. #. @@ -19887,5 +19865,5 @@ #. 50000 #. -#. +#. #. #. @@ -19895,5 +19873,5 @@ #. 50000 #. -#. +#. #. #. @@ -19903,5 +19881,5 @@ #. 50000 #. -#. +#. #. #. @@ -19911,5 +19889,5 @@ #. 50000 #. -#. +#. #. #. @@ -19919,5 +19897,5 @@ #. 50000 #. -#. +#. #. #. @@ -19927,5 +19905,5 @@ #. 50000 #. -#. +#. #. #. @@ -19935,5 +19913,5 @@ #. 50000 #. -#. +#. #. #. @@ -19943,5 +19921,5 @@ #. 50000 #. -#. +#. #. #. @@ -19951,5 +19929,5 @@ #. 50000 #. -#. +#. #. #. @@ -19959,5 +19937,5 @@ #. 50000 #. -#. +#. #. #. @@ -19967,5 +19945,5 @@ #. 50000 #. -#. +#. #. #. @@ -19975,5 +19953,5 @@ #. 50000 #. -#. +#. #. #. @@ -19983,5 +19961,5 @@ #. 50000 #. -#. +#. #. #. @@ -19991,5 +19969,5 @@ #. 50000 #. -#. +#. #. #. @@ -19999,5 +19977,5 @@ #. 50000 #. -#. +#. #. #. @@ -20007,5 +19985,5 @@ #. 50000 #. -#. +#. #. #. @@ -20015,5 +19993,5 @@ #. 50000 #. -#. +#. #. #. @@ -20023,5 +20001,5 @@ #. 50000 #. -#. +#. #. #. @@ -20031,5 +20009,5 @@ #. 50000 #. -#. +#. #. #. @@ -20039,5 +20017,5 @@ #. 50000 #. -#. +#. #. #. @@ -20047,5 +20025,5 @@ #. 50000 #. -#. +#. #. #. @@ -20055,5 +20033,5 @@ #. 50000 #. -#. +#. #. #. @@ -20063,5 +20041,5 @@ #. 50000 #. -#. +#. #. #. @@ -20071,5 +20049,5 @@ #. 50000 #. -#. +#. #. #. @@ -21763,7 +21741,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21773,5 +21751,5 @@ #. 50000 #. -#. +#. #. #. @@ -21781,5 +21759,5 @@ #. 50000 #. -#. +#. #. #. @@ -21789,5 +21767,5 @@ #. 50000 #. -#. +#. #. #. @@ -21797,5 +21775,5 @@ #. 50000 #. -#. +#. #. #. @@ -21805,5 +21783,5 @@ #. 50000 #. -#. +#. #. #. @@ -21813,5 +21791,5 @@ #. 50000 #. -#. +#. #. #. @@ -21821,5 +21799,5 @@ #. 50000 #. -#. +#. #. #. @@ -23150,5 +23128,5 @@ #. 40000 #. -#. +#. #. #. @@ -23164,5 +23142,5 @@ #. 30000 #. -#. +#. #. #. @@ -23173,7 +23151,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23183,5 +23161,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -23191,13 +23177,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -23207,5 +23185,5 @@ #. 50000 #. -#. +#. #. #. @@ -23238,5 +23216,5 @@ #. 50000 #. -#. +#. #. #. @@ -23252,5 +23230,5 @@ #. 50000 #. -#. +#. #. #. @@ -23260,5 +23238,5 @@ #. 10000 #. -#. +#. #. #. @@ -23268,5 +23246,5 @@ #. 10000 #. -#. +#. #. #. @@ -23277,5 +23255,5 @@ #. 10000 #. -#. +#. #. #. @@ -23304,5 +23282,5 @@ #. 50000 #. -#. +#. #. #. @@ -23417,9 +23395,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 @@ -23427,5 +23405,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, @@ -23435,8 +23413,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 @@ -23450,5 +23428,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23456,5 +23434,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23503,6 +23481,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23582,5 +23560,5 @@ #. 40000 #. -#. +#. #. #. @@ -23590,5 +23568,5 @@ #. 10000 #. -#. +#. #. #. @@ -23597,5 +23575,5 @@ #. 50000 #. -#. +#. #. #. @@ -23605,5 +23583,5 @@ #. 50000 #. -#. +#. #. #. @@ -23612,5 +23590,5 @@ #. 50000 #. -#. +#. #. #. @@ -23619,5 +23597,5 @@ #. 50000 #. -#. +#. #. #. @@ -23626,5 +23604,5 @@ #. 50000 #. -#. +#. #. #. @@ -23633,5 +23611,5 @@ #. 50000 #. -#. +#. #. #. @@ -23640,5 +23618,5 @@ #. 40000 #. -#. +#. #. #. @@ -23647,5 +23625,5 @@ #. 50000 #. -#. +#. #. #. @@ -23654,5 +23632,5 @@ #. 50000 #. -#. +#. #. #. @@ -23661,5 +23639,5 @@ #. 50000 #. -#. +#. #. #. @@ -23668,5 +23646,5 @@ #. 50000 #. -#. +#. #. #. @@ -23675,5 +23653,5 @@ #. 50000 #. -#. +#. #. #. @@ -23682,5 +23660,5 @@ #. 50000 #. -#. +#. #. #. @@ -23690,5 +23668,5 @@ #. 50000 #. -#. +#. #. #. @@ -23697,5 +23675,5 @@ #. 50000 #. -#. +#. #. #. @@ -23706,5 +23684,5 @@ #. 50000 #. -#. +#. #. #. @@ -23716,11 +23694,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23729,7 +23707,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23740,5 +23718,5 @@ #. 50000 #. -#. +#. #. #. @@ -23749,5 +23727,5 @@ #. 50000 #. -#. +#. #. #. @@ -23758,5 +23736,5 @@ #. 50000 #. -#. +#. #. #. @@ -23767,5 +23745,5 @@ #. 50000 #. -#. +#. #. #. @@ -23776,5 +23754,5 @@ #. 50000 #. -#. +#. #. #. @@ -23785,5 +23763,5 @@ #. 40000 #. -#. +#. #. #. @@ -23795,5 +23773,5 @@ #. 50000 #. -#. +#. #. #. @@ -23804,5 +23782,5 @@ #. 50000 #. -#. +#. #. #. @@ -23827,5 +23805,5 @@ #. 10000 #. -#. +#. #. #. @@ -23834,5 +23812,5 @@ #. 50000 #. -#. +#. #. #. @@ -23841,5 +23819,5 @@ #. 50000 #. -#. +#. #. #. @@ -23855,5 +23833,5 @@ #. 20000 #. -#. +#. #. #. @@ -23867,5 +23845,5 @@ #. 30000 #. -#. +#. #. #. @@ -23874,5 +23852,5 @@ #. 50000 #. -#. +#. #. #. @@ -23881,5 +23859,5 @@ #. 50000 #. -#. +#. #. #. @@ -23888,5 +23866,5 @@ #. 50000 #. -#. +#. #. #. @@ -23895,5 +23873,5 @@ #. 50000 #. -#. +#. #. #. @@ -23902,5 +23880,5 @@ #. 50000 #. -#. +#. #. #. @@ -23909,5 +23887,5 @@ #. 50000 #. -#. +#. #. #. @@ -23916,5 +23894,5 @@ #. 50000 #. -#. +#. #. #. @@ -23923,5 +23901,5 @@ #. 50000 #. -#. +#. #. #. @@ -23930,5 +23908,5 @@ #. 50000 #. -#. +#. #. #. @@ -23937,5 +23915,5 @@ #. 50000 #. -#. +#. #. #. @@ -23944,5 +23922,5 @@ #. 50000 #. -#. +#. #. #. @@ -23951,5 +23929,5 @@ #. 50000 #. -#. +#. #. #. @@ -23958,5 +23936,5 @@ #. 50000 #. -#. +#. #. #. @@ -23965,5 +23943,5 @@ #. 50000 #. -#. +#. #. #. @@ -24134,7 +24112,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24148,5 +24126,5 @@ #. 40000 #. -#. +#. #. #. @@ -24156,7 +24134,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24166,5 +24144,5 @@ #. 50000 #. -#. +#. #. #. @@ -24174,5 +24152,5 @@ #. 50000 #. -#. +#. #. #. @@ -24182,5 +24160,5 @@ #. 50000 #. -#. +#. #. #. @@ -24190,5 +24168,5 @@ #. 50000 #. -#. +#. #. #. @@ -24204,5 +24182,5 @@ #. 10000 #. -#. +#. #. #. @@ -24212,5 +24190,5 @@ #. 50000 #. -#. +#. #. #. @@ -24220,5 +24198,5 @@ #. 50000 #. -#. +#. #. #. @@ -24228,5 +24206,5 @@ #. 50000 #. -#. +#. #. #. @@ -24236,5 +24214,5 @@ #. 50000 #. -#. +#. #. #. @@ -24244,5 +24222,5 @@ #. 50000 #. -#. +#. #. #. @@ -24252,5 +24230,5 @@ #. 50000 #. -#. +#. #. #. @@ -24269,5 +24247,5 @@ #. 50000 #. -#. +#. #. #. @@ -24276,5 +24254,5 @@ #. 50000 #. -#. +#. #. #. @@ -24288,5 +24266,5 @@ #. 50000 #. -#. +#. #. #. @@ -24300,5 +24278,5 @@ #. 50000 #. -#. +#. #. #. @@ -24307,5 +24285,5 @@ #. 50000 #. -#. +#. #. #. @@ -24319,5 +24297,5 @@ #. 50000 #. -#. +#. #. #. @@ -24332,5 +24310,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24345,5 +24323,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24357,5 +24335,5 @@ #. 50000 #. -#. +#. #. #. @@ -24369,5 +24347,5 @@ #. 50000 #. -#. +#. #. #. @@ -24376,5 +24354,5 @@ #. 50000 #. -#. +#. #. #. @@ -24383,5 +24361,5 @@ #. 50000 #. -#. +#. #. #. @@ -24395,5 +24373,5 @@ #. 50000 #. -#. +#. #. #. @@ -24403,5 +24381,5 @@ #. 50000 #. -#. +#. #. #. @@ -24410,5 +24388,5 @@ #. 50000 #. -#. +#. #. #. @@ -24417,5 +24395,5 @@ #. 50000 #. -#. +#. #. #. @@ -24424,5 +24402,5 @@ #. 50000 #. -#. +#. #. #. @@ -24432,5 +24410,5 @@ #. 50000 #. -#. +#. #. #. @@ -24441,5 +24419,5 @@ #. 50000 #. -#. +#. #. #. @@ -24449,7 +24427,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24459,5 +24437,5 @@ #. 50000 #. -#. +#. #. #. @@ -24467,5 +24445,5 @@ #. 50000 #. -#. +#. #. #. @@ -24475,5 +24453,5 @@ #. 50000 #. -#. +#. #. #. @@ -24484,5 +24462,5 @@ #. 50000 #. -#. +#. #. #. @@ -24492,5 +24470,5 @@ #. 50000 #. -#. +#. #. #. @@ -24500,5 +24478,5 @@ #. 50000 #. -#. +#. #. #. @@ -24508,5 +24486,5 @@ #. 50000 #. -#. +#. #. #. @@ -24516,5 +24494,5 @@ #. 50000 #. -#. +#. #. #. @@ -24524,5 +24502,5 @@ #. 50000 #. -#. +#. #. #. @@ -24532,5 +24510,5 @@ #. 50000 #. -#. +#. #. #. @@ -24540,5 +24518,5 @@ #. 50000 #. -#. +#. #. #. @@ -24548,5 +24526,5 @@ #. 50000 #. -#. +#. #. #. @@ -24569,7 +24547,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24579,5 +24557,5 @@ #. 50000 #. -#. +#. #. #. @@ -24586,5 +24564,5 @@ #. 50000 #. -#. +#. #. #. @@ -24594,5 +24572,5 @@ #. 50000 #. -#. +#. #. #. @@ -24601,5 +24579,5 @@ #. 50000 #. -#. +#. #. #. @@ -24609,5 +24587,5 @@ #. 50000 #. -#. +#. #. #. @@ -24617,5 +24595,5 @@ #. 50000 #. -#. +#. #. #. @@ -24631,5 +24609,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24640,5 +24618,5 @@ #. 50000 #. -#. +#. #. #. @@ -24657,5 +24635,5 @@ #. 50000 #. -#. +#. #. #. @@ -24665,5 +24643,5 @@ #. 50000 #. -#. +#. #. #. @@ -24676,5 +24654,5 @@ #. 50000 #. -#. +#. #. #. @@ -24692,5 +24670,5 @@ #. 50000 #. -#. +#. #. #. @@ -24699,5 +24677,5 @@ #. 50000 #. -#. +#. #. #. @@ -24706,5 +24684,5 @@ #. 50000 #. -#. +#. #. #. @@ -24713,7 +24691,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24724,5 +24702,5 @@ #. 50000 #. -#. +#. #. #. @@ -24737,5 +24715,5 @@ #. 50000 #. -#. +#. #. #. @@ -24749,5 +24727,5 @@ #. 50000 #. -#. +#. #. #. @@ -24757,5 +24735,5 @@ #. 50000 #. -#. +#. #. #. @@ -24769,5 +24747,5 @@ #. 50000 #. -#. +#. #. #. @@ -24781,5 +24759,5 @@ #. 50000 #. -#. +#. #. #. @@ -24788,7 +24766,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24798,5 +24776,5 @@ #. 50000 #. -#. +#. #. #. @@ -24806,5 +24784,5 @@ #. 50000 #. -#. +#. #. #. @@ -24814,5 +24792,5 @@ #. 50000 #. -#. +#. #. #. @@ -24822,5 +24800,5 @@ #. 50000 #. -#. +#. #. #. @@ -24836,7 +24814,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24851,5 +24829,5 @@ #. 30000 #. -#. +#. #. #. @@ -24864,5 +24842,5 @@ #. 30000 #. -#. +#. #. #. @@ -24877,5 +24855,5 @@ #. 30000 #. -#. +#. #. #. @@ -24890,5 +24868,5 @@ #. 30000 #. -#. +#. #. #. @@ -24903,5 +24881,5 @@ #. 30000 #. -#. +#. #. #. @@ -24916,7 +24894,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24926,5 +24904,5 @@ #. 50000 #. -#. +#. #. #. @@ -24933,5 +24911,5 @@ #. 50000 #. -#. +#. #. #. @@ -24941,5 +24919,5 @@ #. 50000 #. -#. +#. #. #. @@ -24949,5 +24927,5 @@ #. 50000 #. -#. +#. #. #. @@ -24957,5 +24935,5 @@ #. 50000 #. -#. +#. #. #. @@ -24965,5 +24943,5 @@ #. 50000 #. -#. +#. #. #. @@ -24973,5 +24951,5 @@ #. 50000 #. -#. +#. #. #. @@ -24981,5 +24959,5 @@ #. 50000 #. -#. +#. #. #. @@ -24989,5 +24967,5 @@ #. 50000 #. -#. +#. #. #. @@ -24997,5 +24975,5 @@ #. 50000 #. -#. +#. #. #. @@ -25005,5 +24983,5 @@ #. 50000 #. -#. +#. #. #. @@ -25013,5 +24991,5 @@ #. 50000 #. -#. +#. #. #. @@ -25021,5 +24999,5 @@ #. 50000 #. -#. +#. #. #. @@ -25039,5 +25017,5 @@ #. 50000 #. -#. +#. #. #. @@ -25052,5 +25030,5 @@ #. 50000 #. -#. +#. #. #. @@ -25063,7 +25041,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25073,5 +25051,5 @@ #. 50000 #. -#. +#. #. #. @@ -25081,5 +25059,5 @@ #. 50000 #. -#. +#. #. #. @@ -25089,5 +25067,5 @@ #. 50000 #. -#. +#. #. #. @@ -25097,5 +25075,5 @@ #. 50000 #. -#. +#. #. #. @@ -25105,5 +25083,5 @@ #. 50000 #. -#. +#. #. #. @@ -25113,5 +25091,5 @@ #. 50000 #. -#. +#. #. #. @@ -25121,5 +25099,5 @@ #. 50000 #. -#. +#. #. #. @@ -25129,5 +25107,5 @@ #. 50000 #. -#. +#. #. #. @@ -25137,5 +25115,5 @@ #. 50000 #. -#. +#. #. #. @@ -25145,5 +25123,5 @@ #. 50000 #. -#. +#. #. #. @@ -25153,5 +25131,5 @@ #. 50000 #. -#. +#. #. #. @@ -25161,5 +25139,5 @@ #. 50000 #. -#. +#. #. #. @@ -25169,5 +25147,5 @@ #. 50000 #. -#. +#. #. #. @@ -25177,5 +25155,5 @@ #. 50000 #. -#. +#. #. #. @@ -25196,5 +25174,5 @@ #. 50000 #. -#. +#. #. #. @@ -25208,7 +25186,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25218,5 +25196,5 @@ #. 50000 #. -#. +#. #. #. @@ -25226,5 +25204,5 @@ #. 50000 #. -#. +#. #. #. @@ -25234,5 +25212,5 @@ #. 50000 #. -#. +#. #. #. @@ -25242,5 +25220,5 @@ #. 50000 #. -#. +#. #. #. @@ -25250,5 +25228,5 @@ #. 50000 #. -#. +#. #. #. @@ -25258,5 +25236,5 @@ #. 50000 #. -#. +#. #. #. @@ -25266,5 +25244,5 @@ #. 50000 #. -#. +#. #. #. @@ -25281,5 +25259,5 @@ #. 50000 #. -#. +#. #. #. @@ -25289,5 +25267,5 @@ #. 50000 #. -#. +#. #. #. @@ -25297,5 +25275,5 @@ #. 50000 #. -#. +#. #. #. @@ -25305,5 +25283,5 @@ #. 50000 #. -#. +#. #. #. @@ -25313,5 +25291,5 @@ #. 50000 #. -#. +#. #. #. @@ -25321,5 +25299,5 @@ #. 50000 #. -#. +#. #. #. @@ -25329,5 +25307,5 @@ #. 50000 #. -#. +#. #. #. @@ -25337,5 +25315,5 @@ #. 50000 #. -#. +#. #. #. @@ -25345,5 +25323,5 @@ #. 50000 #. -#. +#. #. #. @@ -25353,5 +25331,5 @@ #. 50000 #. -#. +#. #. #. @@ -25361,5 +25339,5 @@ #. 50000 #. -#. +#. #. #. @@ -25369,5 +25347,5 @@ #. 50000 #. -#. +#. #. #. @@ -25386,5 +25364,5 @@ #. 50000 #. -#. +#. #. #. @@ -25394,5 +25372,5 @@ #. 50000 #. -#. +#. #. #. @@ -25401,5 +25379,5 @@ #. 50000 #. -#. +#. #. #. @@ -25409,5 +25387,5 @@ #. 50000 #. -#. +#. #. #. @@ -25417,5 +25395,5 @@ #. 50000 #. -#. +#. #. #. @@ -25425,5 +25403,5 @@ #. 50000 #. -#. +#. #. #. @@ -25432,5 +25410,5 @@ #. 50000 #. -#. +#. #. #. @@ -25440,5 +25418,5 @@ #. 50000 #. -#. +#. #. #. @@ -25448,5 +25426,5 @@ #. 50000 #. -#. +#. #. #. @@ -25456,5 +25434,5 @@ #. 50000 #. -#. +#. #. #. @@ -25464,5 +25442,5 @@ #. 50000 #. -#. +#. #. #. @@ -25471,5 +25449,5 @@ #. 50000 #. -#. +#. #. #. @@ -25478,5 +25456,5 @@ #. 50000 #. -#. +#. #. #. @@ -25485,5 +25463,5 @@ #. 50000 #. -#. +#. #. #. @@ -25492,5 +25470,5 @@ #. 50000 #. -#. +#. #. #. @@ -25499,5 +25477,5 @@ #. 50000 #. -#. +#. #. #. @@ -25506,5 +25484,5 @@ #. 50000 #. -#. +#. #. #. @@ -25513,5 +25491,5 @@ #. 50000 #. -#. +#. #. #. @@ -25520,5 +25498,5 @@ #. 50000 #. -#. +#. #. #. @@ -25527,5 +25505,5 @@ #. 50000 #. -#. +#. #. #. @@ -25534,5 +25512,5 @@ #. 50000 #. -#. +#. #. #. @@ -25541,5 +25519,5 @@ #. 50000 #. -#. +#. #. #. @@ -25548,5 +25526,5 @@ #. 50000 #. -#. +#. #. #. @@ -25555,5 +25533,5 @@ #. 50000 #. -#. +#. #. #. @@ -25563,5 +25541,5 @@ #. 50000 #. -#. +#. #. #. @@ -25571,5 +25549,5 @@ #. 50000 #. -#. +#. #. #. @@ -25579,5 +25557,5 @@ #. 50000 #. -#. +#. #. #. @@ -25587,5 +25565,5 @@ #. 50000 #. -#. +#. #. #. @@ -25595,5 +25573,5 @@ #. 50000 #. -#. +#. #. #. @@ -25603,5 +25581,5 @@ #. 50000 #. -#. +#. #. #. @@ -25611,5 +25589,5 @@ #. 50000 #. -#. +#. #. #. @@ -25619,5 +25597,5 @@ #. 50000 #. -#. +#. #. #. @@ -25627,5 +25605,5 @@ #. 50000 #. -#. +#. #. #. @@ -25636,5 +25614,5 @@ #. 50000 #. -#. +#. #. #. @@ -25644,5 +25622,5 @@ #. 50000 #. -#. +#. #. #. @@ -25652,5 +25630,5 @@ #. 50000 #. -#. +#. #. #. @@ -25660,5 +25638,5 @@ #. 50000 #. -#. +#. #. #. @@ -25668,5 +25646,5 @@ #. 50000 #. -#. +#. #. #. @@ -25676,5 +25654,5 @@ #. 50000 #. -#. +#. #. #. @@ -25684,5 +25662,5 @@ #. 50000 #. -#. +#. #. #. @@ -25692,5 +25670,5 @@ #. 50000 #. -#. +#. #. #. @@ -25700,5 +25678,5 @@ #. 50000 #. -#. +#. #. #. @@ -25708,5 +25686,5 @@ #. 50000 #. -#. +#. #. #. @@ -25716,5 +25694,5 @@ #. 50000 #. -#. +#. #. #. @@ -25724,5 +25702,5 @@ #. 50000 #. -#. +#. #. #. @@ -25732,5 +25710,5 @@ #. 50000 #. -#. +#. #. #. @@ -25740,5 +25718,5 @@ #. 50000 #. -#. +#. #. #. @@ -25748,5 +25726,5 @@ #. 50000 #. -#. +#. #. #. @@ -25756,5 +25734,5 @@ #. 50000 #. -#. +#. #. #. @@ -25764,5 +25742,5 @@ #. 50000 #. -#. +#. #. #. @@ -25772,5 +25750,5 @@ #. 50000 #. -#. +#. #. #. @@ -25780,5 +25758,5 @@ #. 50000 #. -#. +#. #. #. @@ -25787,5 +25765,5 @@ #. 50000 #. -#. +#. #. #. @@ -25817,5 +25795,5 @@ #. 50000 #. -#. +#. #. #. @@ -25825,5 +25803,5 @@ #. 50000 #. -#. +#. #. #. @@ -25833,7 +25811,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25848,5 +25826,5 @@ #. 50000 #. -#. +#. #. #. @@ -25856,5 +25834,5 @@ #. 50000 #. -#. +#. #. #. @@ -25864,5 +25842,5 @@ #. 50000 #. -#. +#. #. #. @@ -25872,5 +25850,5 @@ #. 50000 #. -#. +#. #. #. @@ -25880,5 +25858,5 @@ #. 50000 #. -#. +#. #. #. @@ -25888,5 +25866,5 @@ #. 50000 #. -#. +#. #. #. @@ -25896,5 +25874,5 @@ #. 50000 #. -#. +#. #. #. @@ -25910,7 +25888,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25920,5 +25898,5 @@ #. 50000 #. -#. +#. #. #. @@ -25928,5 +25906,5 @@ #. 50000 #. -#. +#. #. #. @@ -25936,5 +25914,5 @@ #. 50000 #. -#. +#. #. #. @@ -25944,5 +25922,5 @@ #. 50000 #. -#. +#. #. #. @@ -25952,5 +25930,5 @@ #. 50000 #. -#. +#. #. #. @@ -25960,5 +25938,5 @@ #. 50000 #. -#. +#. #. #. @@ -25968,5 +25946,5 @@ #. 50000 #. -#. +#. #. #. @@ -25976,5 +25954,5 @@ #. 50000 #. -#. +#. #. #. @@ -25984,5 +25962,5 @@ #. 50000 #. -#. +#. #. #. @@ -25992,5 +25970,5 @@ #. 50000 #. -#. +#. #. #. @@ -26000,5 +25978,5 @@ #. 50000 #. -#. +#. #. #. @@ -26008,5 +25986,5 @@ #. 50000 #. -#. +#. #. #. @@ -26016,5 +25994,5 @@ #. 50000 #. -#. +#. #. #. @@ -26024,5 +26002,5 @@ #. 50000 #. -#. +#. #. #. @@ -26032,5 +26010,5 @@ #. 50000 #. -#. +#. #. #. @@ -26040,5 +26018,5 @@ #. 50000 #. -#. +#. #. #. @@ -26048,5 +26026,5 @@ #. 50000 #. -#. +#. #. #. @@ -26056,5 +26034,5 @@ #. 50000 #. -#. +#. #. #. @@ -26064,5 +26042,5 @@ #. 50000 #. -#. +#. #. #. @@ -26072,5 +26050,5 @@ #. 50000 #. -#. +#. #. #. @@ -26080,5 +26058,5 @@ #. 50000 #. -#. +#. #. #. @@ -26088,5 +26066,5 @@ #. 50000 #. -#. +#. #. #. @@ -26096,5 +26074,5 @@ #. 50000 #. -#. +#. #. #. @@ -26104,5 +26082,5 @@ #. 50000 #. -#. +#. #. #. @@ -26112,5 +26090,5 @@ #. 50000 #. -#. +#. #. #. @@ -26120,5 +26098,5 @@ #. 50000 #. -#. +#. #. #. @@ -26128,5 +26106,5 @@ #. 50000 #. -#. +#. #. #. @@ -26136,5 +26114,5 @@ #. 50000 #. -#. +#. #. #. @@ -26144,5 +26122,5 @@ #. 50000 #. -#. +#. #. #. @@ -26152,5 +26130,5 @@ #. 50000 #. -#. +#. #. #. @@ -26160,5 +26138,5 @@ #. 50000 #. -#. +#. #. #. @@ -26168,5 +26146,5 @@ #. 50000 #. -#. +#. #. #. @@ -26176,5 +26154,5 @@ #. 50000 #. -#. +#. #. #. @@ -26184,5 +26162,5 @@ #. 50000 #. -#. +#. #. #. @@ -26192,5 +26170,5 @@ #. 50000 #. -#. +#. #. #. @@ -26200,5 +26178,5 @@ #. 50000 #. -#. +#. #. #. @@ -26208,5 +26186,5 @@ #. 50000 #. -#. +#. #. #. @@ -26216,5 +26194,5 @@ #. 50000 #. -#. +#. #. #. @@ -26224,5 +26202,5 @@ #. 50000 #. -#. +#. #. #. @@ -26232,5 +26210,5 @@ #. 50000 #. -#. +#. #. #. @@ -26240,5 +26218,5 @@ #. 50000 #. -#. +#. #. #. @@ -26248,5 +26226,5 @@ #. 50000 #. -#. +#. #. #. @@ -26282,7 +26260,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26292,5 +26270,5 @@ #. 50000 #. -#. +#. #. #. @@ -26300,5 +26278,5 @@ #. 50000 #. -#. +#. #. #. @@ -26308,5 +26286,5 @@ #. 50000 #. -#. +#. #. #. @@ -26316,5 +26294,5 @@ #. 50000 #. -#. +#. #. #. @@ -26324,5 +26302,5 @@ #. 50000 #. -#. +#. #. #. @@ -26332,5 +26310,5 @@ #. 50000 #. -#. +#. #. #. @@ -26340,5 +26318,5 @@ #. 50000 #. -#. +#. #. #. @@ -26355,5 +26333,5 @@ #. 50000 #. -#. +#. #. #. @@ -26363,5 +26341,5 @@ #. 50000 #. -#. +#. #. #. @@ -26371,5 +26349,5 @@ #. 50000 #. -#. +#. #. #. @@ -26379,5 +26357,5 @@ #. 50000 #. -#. +#. #. #. @@ -26387,5 +26365,5 @@ #. 50000 #. -#. +#. #. #. @@ -26395,5 +26373,5 @@ #. 50000 #. -#. +#. #. #. @@ -26404,5 +26382,5 @@ #. 50000 #. -#. +#. #. #. @@ -26412,5 +26390,5 @@ #. 50000 #. -#. +#. #. #. @@ -26420,5 +26398,5 @@ #. 40000 #. -#. +#. #. #. @@ -26428,5 +26406,5 @@ #. 50000 #. -#. +#. #. #. @@ -26435,5 +26413,5 @@ #. 40000 #. -#. +#. #. #. @@ -26442,5 +26420,5 @@ #. 40000 #. -#. +#. #. #. @@ -26458,7 +26436,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26468,5 +26446,5 @@ #. 50000 #. -#. +#. #. #. @@ -26476,5 +26454,5 @@ #. 50000 #. -#. +#. #. #. @@ -26484,5 +26462,5 @@ #. 50000 #. -#. +#. #. #. @@ -26492,5 +26470,5 @@ #. 50000 #. -#. +#. #. #. @@ -26500,5 +26478,5 @@ #. 50000 #. -#. +#. #. #. @@ -26508,5 +26486,5 @@ #. 50000 #. -#. +#. #. #. @@ -26516,5 +26494,5 @@ #. 50000 #. -#. +#. #. #. @@ -26524,5 +26502,5 @@ #. 50000 #. -#. +#. #. #. @@ -26532,5 +26510,5 @@ #. 50000 #. -#. +#. #. #. @@ -26549,5 +26527,5 @@ #. 50000 #. -#. +#. #. #. @@ -26561,5 +26539,5 @@ #. 50000 #. -#. +#. #. #. @@ -26573,5 +26551,5 @@ #. 50000 #. -#. +#. #. #. @@ -26581,5 +26559,5 @@ #. 50000 #. -#. +#. #. #. @@ -26593,5 +26571,5 @@ #. 50000 #. -#. +#. #. #. @@ -26605,5 +26583,5 @@ #. 50000 #. -#. +#. #. #. @@ -26617,6 +26595,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26626,5 +26604,5 @@ #. 50000 #. -#. +#. #. #. @@ -26638,5 +26616,5 @@ #. 50000 #. -#. +#. #. #. @@ -26650,5 +26628,5 @@ #. 50000 #. -#. +#. #. #. @@ -26662,5 +26640,5 @@ #. 50000 #. -#. +#. #. #. @@ -26674,5 +26652,5 @@ #. 50000 #. -#. +#. #. #. @@ -26686,5 +26664,5 @@ #. 50000 #. -#. +#. #. #. @@ -26694,7 +26672,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26704,5 +26682,5 @@ #. 50000 #. -#. +#. #. #. @@ -26712,5 +26690,5 @@ #. 50000 #. -#. +#. #. #. @@ -26720,5 +26698,5 @@ #. 50000 #. -#. +#. #. #. @@ -26728,5 +26706,5 @@ #. 50000 #. -#. +#. #. #. @@ -26743,5 +26721,5 @@ #. 50000 #. -#. +#. #. #. @@ -26754,5 +26732,5 @@ #. 50000 #. -#. +#. #. #. @@ -26766,5 +26744,5 @@ #. 50000 #. -#. +#. #. #. @@ -26778,5 +26756,5 @@ #. 50000 #. -#. +#. #. #. @@ -26790,5 +26768,5 @@ #. 50000 #. -#. +#. #. #. @@ -26799,5 +26777,5 @@ #. 50000 #. -#. +#. #. #. @@ -26807,5 +26785,5 @@ #. 50000 #. -#. +#. #. #. @@ -26815,5 +26793,5 @@ #. 50000 #. -#. +#. #. #. @@ -26823,5 +26801,5 @@ #. 50000 #. -#. +#. #. #. @@ -26831,5 +26809,5 @@ #. 50000 #. -#. +#. #. #. @@ -26846,5 +26824,5 @@ #. 50000 #. -#. +#. #. #. @@ -26858,5 +26836,5 @@ #. 50000 #. -#. +#. #. #. @@ -26870,5 +26848,5 @@ #. 50000 #. -#. +#. #. #. @@ -26882,5 +26860,5 @@ #. 50000 #. -#. +#. #. #. @@ -26894,5 +26872,5 @@ #. 50000 #. -#. +#. #. #. @@ -26906,5 +26884,5 @@ #. 50000 #. -#. +#. #. #. @@ -26913,7 +26891,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26923,5 +26901,5 @@ #. 50000 #. -#. +#. #. #. @@ -26931,5 +26909,5 @@ #. 50000 #. -#. +#. #. #. @@ -26939,5 +26917,5 @@ #. 50000 #. -#. +#. #. #. @@ -26947,5 +26925,5 @@ #. 50000 #. -#. +#. #. #. @@ -26955,5 +26933,5 @@ #. 50000 #. -#. +#. #. #. @@ -26963,5 +26941,5 @@ #. 50000 #. -#. +#. #. #. @@ -26971,5 +26949,5 @@ #. 50000 #. -#. +#. #. #. @@ -26986,7 +26964,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26996,5 +26974,5 @@ #. 50000 #. -#. +#. #. #. @@ -27004,5 +26982,5 @@ #. 50000 #. -#. +#. #. #. @@ -27012,5 +26990,5 @@ #. 50000 #. -#. +#. #. #. @@ -27020,5 +26998,5 @@ #. 50000 #. -#. +#. #. #. @@ -27034,5 +27012,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -27081,5 +27059,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27089,5 +27067,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27097,5 +27075,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27105,5 +27083,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27113,5 +27091,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27121,5 +27099,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27129,5 +27107,5 @@ #. 50000 #. -#. +#. #. #. @@ -27137,5 +27115,5 @@ #. 50000 #. -#. +#. #. #. @@ -27145,5 +27123,5 @@ #. 50000 #. -#. +#. #. #. @@ -27153,5 +27131,5 @@ #. 50000 #. -#. +#. #. #. @@ -27161,5 +27139,5 @@ #. 50000 #. -#. +#. #. #. @@ -27169,5 +27147,5 @@ #. 50000 #. -#. +#. #. #. @@ -27187,5 +27165,5 @@ #. 50000 #. -#. +#. #. #. @@ -27194,5 +27172,5 @@ #. 50000 #. -#. +#. #. #. @@ -27201,5 +27179,5 @@ #. 50000 #. -#. +#. #. #. @@ -27208,5 +27186,5 @@ #. 40000 #. -#. +#. #. #. @@ -27215,5 +27193,5 @@ #. 40000 #. -#. +#. #. #. @@ -27222,5 +27200,5 @@ #. 40000 #. -#. +#. #. #. @@ -27315,5 +27293,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -27321,28 +27299,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 @@ -27457,5 +27435,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27468,5 +27446,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27491,6 +27469,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27499,6 +27477,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27513,6 +27491,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 @@ -27526,6 +27504,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 @@ -27545,6 +27523,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27568,6 +27546,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 @@ -27580,4 +27558,98 @@ msgstr "" +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" + +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" + +#~ msgid "Images for {0}" +#~ msgstr "Images for {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Read GPX..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "No time for point {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Cannot read time \"{0}\" from point {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "No images with readable timestamps found." + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS start: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS end: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "current delta: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "timezone difference: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} within the track." + +#~ msgid "Sync clock" +#~ msgstr "Sync clock" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "The date in file \"{0}\" could not be parsed." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "There is no EXIF time within the file \"{0}\"." + +#~ msgid "Image" +#~ msgstr "Image" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "GPS unit timezone (difference to photo)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synchronise Time with GPS Unit" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Time entered could not be parsed." + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Geotagged pictures" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Open images with AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "osmarender options" + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." + #~ msgid "Move" #~ msgstr "Move" @@ -27589,7 +27661,4 @@ #~ msgstr "No data imported." -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Please enter the desired coordinates first." - #~ msgid "Select a bookmark first." #~ msgstr "Select a bookmark first." @@ -27655,5 +27724,4 @@ #~ msgstr "false" -#, java-format #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "Resolve {0} conflicts in {1} objects" @@ -27665,9 +27733,7 @@ #~ msgstr "unnamed" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Cannot open preferences directory: {0}" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27688,9 +27754,9 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgid "Email" @@ -27729,5 +27795,4 @@ #~ msgstr " has zero ref" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Plugin requires JOSM update: {0}." @@ -27749,9 +27814,7 @@ #~ msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Use preset ''{0}'' of group ''{1}''" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Use preset ''{0}''" @@ -27781,5 +27844,4 @@ #~ msgstr "name" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Please report a ticket at {0}" @@ -27803,12 +27865,7 @@ #~ msgstr "Add either site-josm.xml or Wiki Pages." -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Error deleting plugin file: {0}" - #~ msgid "Plugin already exists" #~ msgstr "Plugin already exists" -#, java-format #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." @@ -27816,5 +27873,4 @@ #~ msgstr[1] "{0} Plugins successfully updated. Please restart JOSM." -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Could not download plugin: {0} from {1}" @@ -27826,8 +27882,4 @@ #~ msgstr "Rotate" -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Delete {1} {0}" - #~ msgid "Conflicting relation" #~ msgstr "Conflicting relation" @@ -27839,5 +27891,4 @@ #~ msgstr "EPSG:4326" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Error while loading page {0}" @@ -27850,9 +27901,9 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "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?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgid "Combine ways with different memberships?" @@ -27866,16 +27917,16 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgid "Merge nodes with different memberships?" @@ -27934,5 +27985,4 @@ #~ msgstr "Show Tile Status" -#, java-format #~ msgid "requested: {0}" #~ msgstr "requested: {0}" @@ -27944,5 +27994,4 @@ #~ msgstr "Metacarta Map Rectifier image id" -#, java-format #~ msgid "rectifier id={0}" #~ msgstr "rectifier id={0}" @@ -28009,9 +28058,9 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgid "" @@ -28023,6 +28072,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -28039,6 +28088,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example,replacing 73 with your image id: \n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28047,6 +28096,6 @@ #~ "use." #~ msgstr "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -28057,13 +28106,14 @@ #~ "\n" #~ "Full WMS URL input format example (landsat)\n" -#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&style" -#~ "s=&srs=EPSG:4326&format=image/jpeg\n" +#~ "http://onearth.jpl.nasa.gov/wms.cgi?" +#~ "request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/" +#~ "jpeg\n" #~ "\n" #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example,replacing 73 with your image id:\n" -#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73&srs=EPSG:4326&Service=WMS&V" -#~ "ersion=1.1.0&Request=GetMap&\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id:\n" +#~ "http://labs.metacarta.com/rectifier/wms.cgi?" +#~ "id=73&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&\n" #~ "format=image/png" @@ -28101,5 +28151,4 @@ #~ msgstr "Show Author Panel" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28115,14 +28164,14 @@ #~ "Do not upload any data after this message." -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgid "Upload to OSM..." #~ msgstr "Upload to OSM..." -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -28136,9 +28185,7 @@ #~ "{0}" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Authors: {0}" -#, java-format #~ msgid "Layers: {0}" #~ msgstr "Layers: {0}" @@ -28147,5 +28194,4 @@ #~ msgstr "History of Element" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Conflicts: {0}" @@ -28155,12 +28201,13 @@ #~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "Opens the OpenStreetBugs window and activates the automatic download" +#~ msgstr "" +#~ "Opens the OpenStreetBugs window and activates the automatic download" #~ msgid "Please select one or more closed ways of at least four nodes." #~ msgstr "Please select one or more closed ways of at least four nodes." -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -#~ msgstr "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "" +#~ "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgid "sports" @@ -28180,5 +28227,6 @@ #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" -#~ msgstr "Set manually the Lambert zone (e.g. for locations between two zones)" +#~ msgstr "" +#~ "Set manually the Lambert zone (e.g. for locations between two zones)" #~ msgid "Select Tableau d'Assemblage" @@ -28191,7 +28239,8 @@ #~ msgstr "Lambert Zone 3 cache file (.3)" -#, java-format -#~ msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgstr "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" #~ msgid "Remove Selected" @@ -28225,5 +28274,4 @@ #~ msgstr "Move Down" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Relation Editor: {0}" @@ -28242,5 +28290,4 @@ #~ "elements have a history." -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "Change the projection to {0} first." @@ -28249,5 +28296,4 @@ #~ msgstr "Invalid projection" -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -28264,7 +28310,9 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgid "Board Type" @@ -28278,9 +28326,9 @@ #~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to selected " -#~ "user, opens browser showing selected author profile page." +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." #~ msgstr "" -#~ "Tools to work with authors/users. Selects map data that belongs to selected " -#~ "user, opens browser showing selected author profile page." +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." #~ msgid "Directly load TCX files from JOSM." @@ -28289,6 +28337,6 @@ #~ msgid "" #~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to OSM " -#~ "eg. deleting uninteresting parts of track." +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." #~ msgstr "" #~ "The main feature of the plugin is the possibility to delete points of the " @@ -28307,17 +28355,17 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" #~ "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." +#~ "file.
The password is transferred in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You can " -#~ "adjust the sliders to manually match the photos." +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." #~ msgstr "" -#~ "An error occurred while trying to match the photos to the GPX track. You can " -#~ "adjust the sliders to manually match the photos." +#~ "An error occurred while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." #~ msgid "Error processing changeset upload response" @@ -28327,5 +28375,4 @@ #~ msgstr "Version number missing from OSM data" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28349,5 +28396,4 @@ #~ msgstr "Cannot read numeric value from response" -#, java-format #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "Image with path {0} does not exist or is not readable." @@ -28356,9 +28402,7 @@ #~ msgstr "% of lon:" -#, java-format #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." #~ msgstr "Unexpected \"type\" on member {0} in relation {1}, got {2}." -#, java-format #~ msgid "Resolve conflicts in member list of of relation {0}" #~ msgstr "Resolve conflicts in member list of relation {0}" @@ -28389,17 +28433,18 @@ #~ msgstr "Reached a junction" -#, java-format #~ msgid "" -#~ "The OSM primitive with id {0} has been deleted
on " -#~ "the server by another mapper.

Click {1} to keep your " -#~ "primitive and ignore the deleted state.
Your primitive will be assigend a " -#~ "new id.
Click {2} to accept the state on the server and " -#~ "to delete your primitive.
Click {3} to cancel.
" +#~ "The OSM primitive with id {0} has been " +#~ "deleted
on the server by another mapper.

Click {1} to keep your primitive and ignore the deleted state.
Your " +#~ "primitive will be assigend a new id.
Click {2} to " +#~ "accept the state on the server and to delete your primitive.
Click " +#~ "{3} to cancel.
" #~ msgstr "" -#~ "The OSM primitive with id {0} has been deleted
on " -#~ "the server by another mapper.

Click {1} to keep your " -#~ "primitive and ignore the deleted state.
Your primitive will be assigned a " -#~ "new id.
Click {2} to accept the state on the server and " -#~ "to delete your primitive.
Click {3} to cancel.
" +#~ "The OSM primitive with id {0} has been " +#~ "deleted
on the server by another mapper.

Click {1} to keep your primitive and ignore the deleted state.
Your " +#~ "primitive will be assigned a new id.
Click {2} to " +#~ "accept the state on the server and to delete your primitive.
Click " +#~ "{3} to cancel.
" #~ msgid "" @@ -28416,5 +28461,4 @@ #~ "and start a new layer on the new zone." -#, java-format #~ msgid "Checking whether node {0} is gone ..." #~ msgstr "Checking whether node {0} is gone ..." @@ -28429,5 +28473,4 @@ #~ msgstr "Missing primitive" -#, java-format #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Checking whether primitive {0} is gone ..." @@ -28436,11 +28479,12 @@ #~ msgstr "Update failed" -#, java-format #~ msgid "" -#~ "There are {0} primitives
selected for individual " -#~ "update. Please reduce the selection
to max. {1} primitives." +#~ "There are {0} primitives
selected for " +#~ "individual update. Please reduce the selection
to max. {1} primitives." +#~ "" #~ msgstr "" -#~ "There are {0} primitives
selected for individual " -#~ "update. Please reduce the selection
to max. {1} primitives." +#~ "There are {0} primitives
selected for " +#~ "individual update. Please reduce the selection
to max. {1} primitives." +#~ "" #~ msgid "Selection too big" @@ -28456,5 +28500,4 @@ #~ msgstr "Upload to OSM API failed" -#, java-format #~ msgid "" #~ "Uploading failed because a primitive you tried " @@ -28488,9 +28531,10 @@ #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" -#~ msgstr "Didn't find an primitive with id {0} and version {1} in this dataset" +#~ msgstr "" +#~ "Didn't find an primitive with id {0} and version {1} in this dataset" #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -28506,6 +28550,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example, replacing 73 with your image id:\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28514,6 +28558,6 @@ #~ "use." #~ msgstr "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -28529,6 +28573,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example, replacing 73 with your image id:\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28537,5 +28581,4 @@ #~ "use." -#, java-format #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" #~ msgstr "Error header \"{0}\" does not match expected pattern \"{1}\"" @@ -28544,5 +28587,4 @@ #~ msgstr "Failed to initialise API. Please try again later." -#, java-format #~ msgid "" #~ "WARNING: launching browser windows for the first {0} of {1} selected " @@ -28555,5 +28597,4 @@ #~ msgstr "API initialisation failed" -#, java-format #~ msgid "removing reference from way {0}" #~ msgstr "removing reference from way {0}" @@ -28565,5 +28606,4 @@ #~ msgstr "No data" -#, java-format #~ msgid "Remove relation member {0} {1}" #~ msgstr "Remove relation member {0} {1}" @@ -28575,5 +28615,4 @@ #~ msgstr "Add a new XML source to the list." -#, java-format #~ msgid "The XML source (URL or filename) for {0} definition files." #~ msgstr "The XML source (URL or filename) for {0} definition files." @@ -28591,5 +28630,4 @@ #~ msgstr "Download referrers..." -#, java-format #~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" #~ msgstr "Warning: failed to put a dialog always on top. Exception was: {0}" @@ -28598,5 +28636,4 @@ #~ msgstr "Can't search because there is no loaded data." -#, java-format #~ msgid "" #~ "Warning: failed to bring extended dialog always on top. Exception: {0}" @@ -28611,13 +28648,11 @@ #~ "Exception: {0}" -#, java-format #~ msgid "" -#~ "Warning: failed to put ''please wait dialog'' always on top. Exception was: " -#~ "{0}" +#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " +#~ "was: {0}" #~ msgstr "" -#~ "Warning: failed to put ''please wait dialog'' always on top. Exception was: " -#~ "{0}" - -#, java-format +#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " +#~ "was: {0}" + #~ msgid "" #~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" @@ -28625,5 +28660,4 @@ #~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" -#, java-format #~ msgid "Do you really want to delete layer ''{0}''?" #~ msgstr "Do you really want to delete layer ''{0}''?" @@ -28632,5 +28666,4 @@ #~ msgstr "Delete all" -#, java-format #~ msgid "" #~ "Warning: failed to put properties dialog always on top. Exception was: {0}" @@ -28638,9 +28671,7 @@ #~ "Warning: failed to put properties dialog always on top. Exception was: {0}" -#, java-format #~ msgid "Deleting layer {0} of {1}" #~ msgstr "Deleting layer {0} of {1}" -#, java-format #~ msgid "" #~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" @@ -28648,14 +28679,14 @@ #~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" -#, java-format #~ msgid "" -#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" #~ msgstr "" -#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" #~ msgid "Linked" #~ msgstr "Linked" -#, java-format #~ msgid "" #~ "Warning: failed to put history browser always on top. Exception was: {0}" @@ -28663,5 +28694,4 @@ #~ "Warning: failed to put history browser always on top. Exception was: {0}" -#, java-format #~ msgid "" #~ "Failed to close changeset {0}, will be closed by server after timeout. " @@ -28686,5 +28716,4 @@ #~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" -#, java-format #~ msgid "" #~ "There are unsaved changes in {0} layer. Discard the changes and continue?" @@ -28696,5 +28725,4 @@ #~ "There are unsaved changes in {0} layers. Discard the changes and continue?" -#, java-format #~ msgid "" #~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " @@ -28704,23 +28732,20 @@ #~ "relation?" -#, java-format #~ msgid "" -#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " -#~ "from relation?" +#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." +#~ "
Delete from relation?" #~ msgstr "" -#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " -#~ "from relation?" - -#, java-format +#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." +#~ "
Delete from relation?" + #~ msgid "Help page missing. Create it in English." #~ msgstr "Help page missing. Create it in English." -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgid "Didn't find an primitive with id {0} in this dataset" @@ -28731,11 +28756,10 @@ #~ msgid "" -#~ "Helppage missing. Create it in English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" -#~ "Help page missing. Create it in English or your language." - -#, java-format +#~ "Help page missing. Create it in English or your language." + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "unexpected return value. Got {0}" @@ -28753,5 +28777,4 @@ #~ msgstr "no latest version found. History is empty." -#, java-format #~ msgid "Index out of bounds. Got {0}." #~ msgstr "index out of bounds Got {0}" @@ -28760,5 +28783,4 @@ #~ msgstr "Display the history of the selected primitive" -#, java-format #~ msgid "" #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." @@ -28766,9 +28788,10 @@ #~ "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" -#, java-format #~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''." +#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " +#~ "''{1}''." #~ msgstr "" -#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''" +#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got " +#~ "''{1}''" #~ msgid "Replace" @@ -28781,5 +28804,4 @@ #~ msgstr "No type found. History is empty." -#, java-format #~ msgid "Preset group ''{0}'' of group ''{1}''" #~ msgstr "Preset group ''{0}'' of group ''{1}''" Index: /applications/editors/josm/i18n/po/es.po =================================================================== --- /applications/editors/josm/i18n/po/es.po (revision 18974) +++ /applications/editors/josm/i18n/po/es.po (revision 18975) @@ -8,7 +8,7 @@ "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:12+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-12-06 10:44+0000\n" +"Last-Translator: Emilio Gomez Fernandez \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:04+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:19+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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 "Error" @@ -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 "Complementos" @@ -315,4 +310,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 @@ -320,8 +317,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 @@ -331,29 +328,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 @@ -382,8 +377,8 @@ #, java-format msgid "" -"There are no layers the source layer
''{0}''
could be merged " -"to." -msgstr "" -"No hay capas de capa fuente
\"{0}\"
podría ser unida a." +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" +"No hay capas a las que pueda unirse la capa fuente
\"{0}\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 @@ -434,14 +429,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 "Latitud" #: ../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 "Longitud" @@ -449,17 +444,17 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 msgid "Please enter a valid latitude in the range -90..90" -msgstr "" +msgstr "Por favor, introduce una latitud válida en el rango -90..90" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 msgid "Please enter a latitude in the range -90..90" -msgstr "" +msgstr "Por favor, una latitud válida en el rango -90..90" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 msgid "Please enter a valid longitude in the range -180..180" -msgstr "" +msgstr "Por favor, introduce una latitud válida en el rango-180..180" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 msgid "Please enter a longitude in the range -180..180" -msgstr "" +msgstr "Introduzca una longitud en el rango -180..180" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 @@ -467,10 +462,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 @@ -482,9 +477,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 msgid "Close the dialog and create a new node" -msgstr "" +msgstr "Cerrar el diálogo y crear un nuevo nodo" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 msgid "Close the dialog, don't create a new node" -msgstr "" +msgstr "Cerrar el diálogo, no crear un nuevo nodo" #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 @@ -501,19 +496,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 @@ -522,9 +520,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 @@ -540,7 +535,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 @@ -552,11 +547,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" @@ -644,5 +639,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}" @@ -697,10 +692,10 @@ "única de nodos)" -#: ../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 "Combinar {0} vías" -#: ../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 "Por favor, selecciona al menos dos vías para combinar." @@ -719,19 +714,19 @@ msgstr "Por favor, seleccione algo que copiar." +#: ../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 "Crear círculo" -#: ../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 "Crear un círculo a partir de tres nodos." -#: ../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 "Los nodos no se encuentrar en un círculo. Abortando." -#: ../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 " @@ -744,9 +739,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 @@ -821,21 +816,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" @@ -843,6 +842,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 @@ -871,5 +870,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 "Duplicar" @@ -899,10 +898,10 @@ #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30 msgid "Fullscreen View" -msgstr "" +msgstr "Vista a pantalla completa" #. no icon #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32 msgid "Toggle fullscreen view" -msgstr "" +msgstr "Alterna la vista de pantalla completa" #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33 @@ -926,8 +925,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 @@ -935,5 +932,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 @@ -946,8 +943,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 @@ -966,8 +963,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 @@ -990,13 +987,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 @@ -1038,4 +1036,105 @@ "Mostrar información sobre los objetos nodos, formas o relaciones de OSM." +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "Unir áreas superpuestas" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Joins areas that overlap each other" +msgstr "Unir áreas que se superponen con otras" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +msgid "Only up to two areas can be joined at the moment." +msgstr "Sólo un máximo de dos áreas pueden unirse por el momento." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#, java-format +msgid "\"{0}\" is not closed and therefore can't be joined." +msgstr "\"{0}\" no está cerrado y, por tanto, no se puede unir." + +#: ../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 "" +"La(s) vía(s) seleccionadas tienen nodos fuera del área descargada.\n" +"Esto puede acabar con nodos borrados accidentalmente.\n" +"¿Está seguro de continuar?" + +#: ../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 "Por favor, abortar si usted no está seguro" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 +msgid "Please select at least one closed way the should be joined." +msgstr "Por favor, seleccione al menos un vial cerrado para ser unido." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +msgid "No intersection found. Nothing was changed." +msgstr "No se encontró ninguna intersección. Nada ha cambiado." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +msgid "Added node on all intersections" +msgstr "Nodo añadido en todas las intersecciones" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgid "Delete Ways that are not part of an inner multipolygon" +msgstr "Eliminar vías que no formen parte de un multipolígono interior" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +msgid "Fix relations" +msgstr "Arreglar relaciones" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgid "Joined self-overlapping area" +msgstr "Fusionar área superpuesta consigo misma" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +msgid "Joined overlapping areas" +msgstr "Fusionar áreas superpuestas" + +#: ../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 "" +"Algunas de las vías forman que parte de relaciones han sido modificados. Por " +"favor, compruebe los errores no se han introducido." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +msgid "Enter values for all conflicts." +msgstr "Introduzca valores para todos los conflictos." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Resolver conflictos" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +msgid "Fix tag conflicts" +msgstr "Arreglar conflictos de etiquetas" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +msgid "Removed Element from Relations" +msgstr "Eliminar elementos de las relaciones" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +msgid "Join Areas: Remove Short Ways" +msgstr "Fusionar áreas: eliminar las vías cortas" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +msgid "Closed Way" +msgstr "Vía cerrada" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgid "Remove tags from inner ways" +msgstr "Eliminar etiquetas de vías internas" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +msgid "Join Areas Function" +msgstr "Función para la fusión de áreas" + #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 @@ -1055,4 +1154,48 @@ msgstr "Sin acceso directo" +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Jump To Position" +msgstr "Salta a la posición" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Opens a dialog that allows to jump to a specific location" +msgstr "" +"Abre una ventana de diálogo que permite desplazarse a una localización " +"especifica" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57 +msgid "Enter Lat/Lon to jump to position." +msgstr "Introduzca Lat/Lon para ir a la posición." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 +msgid "You can also paste an URL from www.openstreetmap.org" +msgstr "También puedes pegar una dirección URL de www.openstreetmap.org" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 +msgid "Zoom (in metres)" +msgstr "Zoom (en metros)" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 +msgid "URL" +msgstr "URL" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 +msgid "Jump there" +msgstr "Ir allí" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 +msgid "Jump to Position" +msgstr "Salta a la posición" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Could not parse Latitude, Longitude or Zoom. Please check." +msgstr "" +"Imposible analizar la Longitud, Latitud y Zoom. Por favor, verifíquelo." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Unable to parse Lon/Lat" +msgstr "Imposible analizar sintácticamente Lon/Lat" + #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" @@ -1063,26 +1206,26 @@ msgstr "Unir la capar actual en otrar capa" +#: ../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 "Unir nodos" -#: ../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 "Unir nodos en el más antiguo." -#: ../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 "Por favor seleccione por lo menos dos nodos para unir." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126 msgid "Abort Merging" msgstr "Abortar fusión" -#: ../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 "Clic para anular la fusión de nodos" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135 #, java-format msgid "" @@ -1090,5 +1233,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" @@ -1277,6 +1420,6 @@ "Está usando el proyecto EPSG:4326 el cual podría dar lugar
a " "indeseables resultados cuando haga alineamientos rectangulares.
Cambie su " -"proyección para conseguir eliminar esta advertencia.
¿Desea " -"continuar?" +"proyección para conseguir eliminar esta advertencia.
¿Desea continuar?" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 @@ -1472,6 +1615,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 "" "Mostrar informe de situación con información útil que se puede asociar a los " @@ -1493,9 +1635,43 @@ #: ../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 "Cerrar" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Simplificar vía" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Eliminar nodos innecesarios de una vía." + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "Por favor, seleccione al menos una para simplificar." + +#: ../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] "" +"La selección contiene {0} vía. ¿Está seguro que quiere simplificarla?" +msgstr[1] "" +"La selección contiene {0} vías. ¿Está seguro que quiere simplificarlas todas?" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 +msgid "Are you sure?" +msgstr "¿Está usted seguro?" + +#: ../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] "Vía simplificada (eliminado {0} nodo)" +msgstr[1] "Vía simplificada (eliminados {0} nodos)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1628,6 +1804,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 "* Un nodo usado por más de una vía y una de esas vías, o" @@ -1707,15 +1882,15 @@ #. 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 "Descargar datos" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "No current dataset found" msgstr "Actualización de datos no encontrada" -#: ../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" @@ -1723,9 +1898,9 @@ "No se ha encontrado ningún objeto con ID {0} en el conjunto de datos actual" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Update selection" msgstr "Actualizar selección" -#: ../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)" @@ -1734,31 +1909,31 @@ "descarga de datos)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 msgid "Update Selection" msgstr "Actualización de selección" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 msgid "There are no selected objects to update." msgstr "No hay objetos seleccionados que actualizar." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "Selection empty" msgstr "Selección vacía" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 msgid "Update objects" msgstr "Cargando objetos" -#: ../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 "Subir datos" -#: ../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 "" "Actualizar en el servidor todos los objetos en la capa de datos activa." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 #, java-format msgid "" @@ -1769,35 +1944,35 @@ "corregirlos primero." -#: ../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 "Ningún cambio que subir" -#: ../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 "Nada que subir. Consigue algunos datos primero." -#: ../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 "Sincronizar únicamente el nodo {0}" -#: ../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 "Sincronizar únicamente la vía {0}" -#: ../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 "Sincronizar únicamente la relación {0}" -#: ../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 "Sincronizar el conjunto de datos completo" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1805,41 +1980,39 @@ "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.
" +"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 "" "La subida falló debido a que el servidor tiene una " "versión más reciente de uno
de sus nodos, vías o relaciones.
El " -"conflicto es causado por el {0} con ID " -"{1},
el servidor tiene la versión {2}, su versión es " -"{3}.

Pulse {4} para sincronizar los primitivos en " -"conflicto únicamente.
Pulse {5} para sincronizar el " -"conjunto de datos local completo con el servidor.
Pulse " -"{6} para abortar y continuar editando.
" - -#: ../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 +"conflicto es causado por el {0} con ID {1}," +"
el servidor tiene la versión {2}, su versión es {3}.

Pulse " +"{4} para sincronizar los primitivos en conflicto únicamente." +"
Pulse {5} para sincronizar el conjunto de datos local " +"completo con el servidor.
Pulse {6} para abortar y " +"continuar editando.
" + +#: ../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 "Se han detectado conflictos" -#: ../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.
" +"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 "" "La subida falló porque el servidor tiene una versión " -"más reciente de uno
de sus nodos, vías o relaciones.

Pulse " -"{0} para sincronizar el conjunto de datos local completo " -"con el servidor.
Pulse {1} para abortar y continuar " -"editando.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 +"más reciente de uno
de sus nodos, vías o relaciones.

Pulse " +"{0} para sincronizar el conjunto de datos local completo con el " +"servidor.
Pulse {1} para abortar y continuar editando." +"
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1849,26 +2022,26 @@ msgstr "" "El envío de datos falló debido a que se ha " -"empleado
un conjunto de cambios {0} que se cerró previamente " -"({1}).
Vuelva a enviar los datos de nuevo con un conjunto de cambios " -"nuevo o uno existente y abierto." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 +"empleado
un conjunto de cambios {0} que se cerró previamente ({1})." +"
Vuelva a enviar los datos de nuevo con un conjunto de cambios nuevo o " +"uno existente y abierto." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 msgid "Changeset closed" msgstr "Conjunto de cambios cerrados" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 msgid "Prepare conflict resolution" msgstr "Preparar la resolución de conflictos" -#: ../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 "Haz click para cancelar y continuar editando el mapa" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 #, java-format msgid "" @@ -1879,15 +2052,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 "Nodo todavía en uso" -#: ../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 "Oinarrizkoa eguneratzen" @@ -1899,6 +2072,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 "" @@ -1907,38 +2080,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 "Subiendo {0} objetos..." -#: ../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 "Subiendo selección" -#: ../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 "Cargar todos los cambios en la selección actual al servidor de OSM." -#: ../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 "Verificando padres para los objetos borrados" -#: ../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 "Leyendo padres de ''{0}''" -#: ../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 "" @@ -2105,13 +2277,13 @@ "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 "" "Hay {0} primitivas en su conjunto local de datos que
pueden estar " "borradas en el servidor. Si posteriormente trata de borrarlas " -"o
actualizarlas probablemente el servidor informará de " -"un
conflicto.

Pulse {1} para comprobar el estado " -"de estas primitivas
en el servidor-
Pulse {2} para " -"ignorar.
" +"o
actualizarlas probablemente el servidor informará de un
conflicto." +"

Pulse {1} para comprobar el estado de estas " +"primitivas
en el servidor-
Pulse {2} para ignorar." +"
" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183 @@ -2179,38 +2351,38 @@ msgstr "seleccionado" -#: ../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 "No se puede añadir un nodo fuera del mundo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Añadir nodo" -#: ../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 "Añadir nodo a la vía" -#: ../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 "Conectar la vía existente al nodo" -#: ../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 "Añadir un nodo nuevo a una vía existente" -#: ../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 "Añadir un nodo a la vía y conectar" -#: ../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 "Crear un nodo nuevo." -#: ../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 "Seleccionar el nodo bajo el cursor." -#: ../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." @@ -2219,14 +2391,14 @@ msgstr[1] "Insertar un nuevo nodo en {0} vías." -#: ../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 "Comenzar una nueva vía desde el último nodo." -#: ../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 "Continuar la vía desde el último nodo." -#: ../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 "Finalizar dibujo." @@ -2262,6 +2434,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 "" "Desplace la flecha de reproducción y suéltela cerca de la traza para " @@ -2369,5 +2541,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." @@ -2427,6 +2599,6 @@ "type=, *=*, *=" msgstr "" -"type=* - clave 'type' con cualquier valor. Probar también " -"*=valor, type=, *=*, *=" +"type=* - clave 'type' con cualquier valor. Probar también *=valor, type=, *=*, *=" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 @@ -2455,37 +2627,42 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "" +"user:... - todos los objetos modificados por un determinado usuario" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" -msgstr "" -"id:... - objecto con el ID indicado (0 para los objetos nuevos)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +msgstr "id:... - objecto con el ID indicado (0 para los objetos nuevos)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objetos con un determinado número de nodos" -#: ../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-" "max)" msgstr "" -"tags:... - objeto con un número dado de etiquetas (tags:total o " -"tags:min-max)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +"tags:... - objeto con un número dado de etiquetas (tags:total o tags:" +"min-max)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "modified - all changed objects" msgstr "modified - todos los objetos modificados" -#: ../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 "selected - todos los objetos seleccionados" -#: ../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 "incomplete - todos los objetos incompletos" -#: ../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 "untagged - todos los objetos sin etiquetar" -#: ../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" @@ -2494,5 +2671,5 @@ "la expresión" -#: ../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" @@ -2501,5 +2678,5 @@ "cumplan la expresión" -#: ../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 "" @@ -2507,14 +2684,14 @@ "lógico O (disyunción)" -#: ../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 "" "Usar \" para delimitar operadores (por ejemplo si la clave contiene :)" -#: ../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 "Usar ( y ) para agrupar expresiones" -#: ../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 @@ -2524,55 +2701,55 @@ msgstr "Filtrar" -#: ../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 "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Submit filter" msgstr "Enviar filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Start Search" msgstr "Iniciar búsqueda" -#: ../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 "No se encontraron coincidencias para \"{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 "No se ha añadido nada a la selección al buscar \"{0}\"" -#: ../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 "No se ha quitado nada de la selección al buscar \"{0}\"" -#: ../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 "No se ha encontrado nada en la selección buscando por ''{0}''" -#: ../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 "Se han encontrado {0} coincidencias" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2586,5 +2763,5 @@ "{2}" -#: ../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 "" @@ -2592,10 +2769,10 @@ "de uso: clave=valor" -#: ../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 "Error en la sintáxis del patrón: ¡el patrón {0} de {1} no es válido!" -#: ../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" @@ -2604,26 +2781,26 @@ "relación" -#: ../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 "Credencial de autentificación inexperada: {0}" -#: ../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 "No se encuentran los argumentos de or" -#: ../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 "No se encuentran los argumentos de not" -#: ../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 "Se esperaba un cierre de paréntesis." -#: ../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 "Número de parámetros erróneos para las etiquetas de operador" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 #, java-format msgid "" @@ -2634,9 +2811,9 @@ "rango de etiquetas, por ejemplo tags:1 o tags:2-5" -#: ../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 "Número de parámetros incorrecto para el operador de nodos." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 #, java-format msgid "" @@ -2647,5 +2824,5 @@ "número de nodos o un intervalo, por ejemplo nodos:10-20" -#: ../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." @@ -2696,8 +2873,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" +#, fuzzy, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" msgstr "" "Advertencia: automáticamente truncando el valor de la etiqueta \"{0}\" en " @@ -2705,7 +2881,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2733,7 +2909,7 @@ "dependency." msgstr "" -"Las relaciones {0} son cíclicas (cada una se refiere a la " -"otra)
JOSM no puede enviarlas. Por favor: edite las relaciones y elimine " -"la dependencia cíclica." +"Las relaciones {0} son cíclicas (cada una se refiere a la otra)" +"
JOSM no puede enviarlas. Por favor: edite las relaciones y elimine la " +"dependencia cíclica." #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53 @@ -2844,9 +3020,9 @@ "conflict can't be added." msgstr "" -"La capa ''{0}'' ya tiene un conflicto con la primitiva " -"
''{1}''.
Este conflicto no puede ser añadido." +"La capa ''{0}'' ya tiene un conflicto con la primitiva
''{1}''." +"
Este conflicto no puede ser añadido." #: ../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 "Doble conflicto" @@ -2867,5 +3043,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 "" @@ -2886,19 +3063,19 @@ msgstr "no se puede resolver los conflictos pendientes" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 +#: ../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 "El párametro ''{0}'' no debe estar vacío" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61 +#: ../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:107 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 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" @@ -2907,5 +3084,5 @@ msgstr[1] "Eliminar {0} objetos" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2914,5 +3091,5 @@ msgstr[1] "Eliminar {0} nodos" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2921,5 +3098,5 @@ msgstr[1] "Eliminar {0} vías" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2930,10 +3107,10 @@ #. 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?" +#: ../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 "" "Está a punto de borrar nodos fuera del área que se ha descargado.
Esto " @@ -2941,5 +3118,5 @@ "usándolos.
¿Esta seguro que quiere borrarlo?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "Confirmación antes de borrar" @@ -2957,15 +3134,15 @@ msgstr[1] "Mover {0} nodos" -#: ../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 "Eliminado objeto ''{0}''" -#: ../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 "{0} objetos eliminados" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154 #, java-format msgid "" @@ -2976,5 +3153,5 @@ "debajo de 2. El actual es {1}" -#: ../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}" @@ -2985,11 +3162,4 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Resolver conflictos en la lista de miembros de la relación {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "" -"No se puede deshacer la orden ''{0}'' porque la capa \"{1}'' ya no está " -"presente" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3068,5 +3238,5 @@ msgstr "¿Aplicar?" -#: ../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 " @@ -3226,6 +3396,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 "" "El archivo de preferencias contiene errores.
Realizando una copia " @@ -3315,5 +3485,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3322,5 +3492,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3328,25 +3498,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 "S" #. 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 "N" #. 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 "O" #. 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 "E" #: ../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 @@ -3374,25 +3544,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}" @@ -3400,6 +3571,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 "" @@ -3462,24 +3633,24 @@ msgstr "F" -#: ../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 "Se esperaba un ID >=0. Obtenido {0}" -#: ../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 "una proimitiva con id=0 no puede ser invisible" -#: ../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 "Se esperaba un ID >0. Obtenido {0}" -#: ../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 "Se esperaba una versión > 0. Encontrada {0}" -#: ../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 " @@ -3487,5 +3658,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 "" @@ -3496,6 +3667,5 @@ #, java-format msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''." -msgstr "" -"el parámetro \"{0}\" no es un nombre de tipo válido, se obtuvo \"{1}\"" +msgstr "el parámetro \"{0}\" no es un nombre de tipo válido, se obtuvo \"{1}\"" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:48 @@ -3518,6 +3688,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}." @@ -3535,9 +3705,7 @@ #, java-format msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''." -msgstr "" -"se esperaba el parámetro ''{0}'' en el intervalo 0..{1}, se obtuvo {2}" +msgstr "se esperaba el parámetro ''{0}'' en el intervalo 0..{1}, se obtuvo {2}" #: ../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 @@ -3549,6 +3717,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 "" "No se puede comparar la primitiva con ID \"{0}\" con la primitiva con ID " @@ -3561,135 +3728,135 @@ msgstr "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}" -#: ../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 "Vía de tipo área sin cerrar" -#: ../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 "La vía multipoligonal ''{0}'' no está cerrada." -#: ../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 "Miembro ''{0}'' borrado en la relación." -#: ../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 "Vía ''{0}'' con menos de dos puntos." -#: ../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 "Se ha encontrado más de una vía \"desde\"." -#: ../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 "Se ha encontrado más de una vía \"a\"." -#: ../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 "Se ha encontrado más de un elemento \"vía\"." -#: ../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 "Función ''{0}'' desconocida." -#: ../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 "Tipo de miembro \"{0}\" desconocido." -#: ../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 "No se ha encontrado ninguna vía \"desde\"." -#: ../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 "No se ha encontrado ninguna vía \"a\"." -#: ../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 "No se ha encontrado ningún nodo o vía con el rol \"vía\"." -#: ../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 "La vía \"desde\" no comienza o termina en un nodo \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../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 "La vía \"a\" no comienza o termina en un nodo \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "La vía \"desde\" no comienza o termina en la vía con rol \"vía\"." -#: ../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 "La vía \"a\" no comienza o termina en la vía con rol \"vía\"." -#: ../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 "No se ha encontrado el estilo para la restricción {0}." -#: ../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 "Intersección entre las vías ''{0}'' y ''{1}''." -#: ../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 "La vía interior ''{0}'' se encuentra en la parte de fuera." -#: ../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 "La función \"{0}\" no es útil para el tramo \"{1}\"." -#: ../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 "La no-vía ''{0}'' en multipolígono" -#: ../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 "Ninguna vía exterior en el multipolígono ''{0}''." -#: ../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 "El estilo de la vía interior ''{0}'' es igual al del multipolígono" -#: ../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 "El estilo de la vía exterior ''{0}'' no coincide." -#: ../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 "sin etiquetar" -#: ../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 "texto" -#: ../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 "Error: {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}" @@ -3701,5 +3868,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 @@ -3718,5 +3885,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 @@ -3736,5 +3903,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 "fondo" @@ -3852,9 +4019,8 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 #, java-format -msgid "" -"Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "" -"No se pueden leer los marcadores desde
''{0}''
El error fue: " -"{1}" +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" +"No se pueden leer los marcadores desde
''{0}''
El error fue: {1}" +"" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78 @@ -3868,5 +4034,5 @@ msgstr "No mostrar de nuevo" -#: ../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 @@ -3874,32 +4040,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 "incompleto" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "vía" -#: ../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 "ferrocarril" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "vía fluvial" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "uso del suelo" -#: ../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" @@ -3908,5 +4074,5 @@ msgstr[1] "{0} nodos" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -4157,15 +4323,14 @@ #, java-format msgid "Preference setting {0} has been removed since it is no longer used." -msgstr "" -"La opción de configuración {0} ha sido eliminada porque ya no se usa." - -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +msgstr "La opción de configuración {0} ha sido eliminada porque ya no se usa." + +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Archivo" -#: ../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 @@ -4179,19 +4344,19 @@ msgstr "Editar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Vista" -#: ../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 "Herramientas" -#: ../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 "Predefinidos" -#: ../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 @@ -4202,5 +4367,5 @@ msgstr "Menú: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Audio" @@ -4244,29 +4409,29 @@ msgstr "escalar" -#: ../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 "La longitud geográfica en el puntero del ratón." -#: ../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 "El nombre del objeto en el puntero del ratón" -#: ../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 "La latitud geográfica en el puntero del ratón." -#: ../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 "El ángulo entre el segmento actual de vía y el anterior." -#: ../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 "La dirección (brújula) del segmento de línea que se está dibujando." -#: ../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 "La longitud del nuevo segmento de línea que se está dibujando." -#: ../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 " @@ -4274,9 +4439,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(sin objeto)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "Usuario:" @@ -4388,5 +4553,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" @@ -4395,5 +4560,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" @@ -4402,5 +4567,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" @@ -4419,5 +4584,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 @@ -4434,5 +4599,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" @@ -4508,22 +4673,22 @@ msgstr "Resolución de conflictos" -#: ../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 "pa´rametro actual fuera del rango: obtenido {0}" -#: ../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 "inexperado valor del parámetro \"index\". Obtenido {0}" -#: ../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." @@ -4616,6 +4781,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 "" "Copiar sus elementos seleccionados al final de la lista de elementos " @@ -4691,6 +4855,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" "Pulsar {0} para iniciar la fusión de mis entradas y " @@ -4700,6 +4864,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" "Pulsar {0} para terminar la fusión de mis entradas y " @@ -4760,6 +4924,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 "" "Ocurrió un error mientras se comunicaba con el servidor
Detalles: " @@ -4787,6 +4951,6 @@ msgstr "" "Hay {0} nodos adicionales usados por la vía {1}
que están borrados " -"en el servidor.

¿Quiere deshacer el borrado de esos nodos " -"también?" +"en el servidor.

¿Quiere deshacer el borrado de esos nodos también?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 @@ -4797,10 +4961,10 @@ #, java-format msgid "" -"There are {0} additional primitives referred to by relation " -"{1}
which are deleted on the server.

Do you want to undelete them " -"too?" -msgstr "" -"Hay {0} primitivos adicionales a los que se refiere la relación " -"{1}
que están borrados en el servidor.

¿Quiere deshacer también el " +"There are {0} additional primitives referred to by relation {1}" +"
which are deleted on the server.

Do you want to undelete them too?" +"" +msgstr "" +"Hay {0} primitivos adicionales a los que se refiere la relación {1}" +"
que están borrados en el servidor.

¿Quiere deshacer también el " "borrado de los primitivos?" @@ -4951,5 +5115,5 @@ msgstr "Primitiva" -#: ../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 "" @@ -5090,5 +5254,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 "Aplicar" @@ -5188,7 +5352,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" @@ -5198,6 +5362,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" @@ -5231,7 +5395,5 @@ msgstr "Aún no decidido" -#. --- 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 "Función:" @@ -5302,4 +5464,6 @@ msgid "Please select the values to keep for the following tags." msgstr "" +"Por favor, seleccione los valores a conservar para las siguientes " +"etiquetas." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 @@ -5320,5 +5484,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 @@ -5386,10 +5550,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 "" @@ -5464,18 +5627,18 @@ msgstr "Modo de filtro" -#: ../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 "Historial" -#: ../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 "Mostrar el historial de todos los elementos seleccionados" -#: ../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 @@ -5485,14 +5648,14 @@ msgstr "Recargar" -#: ../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 "" "Recarge todos los objetos actualmente seleccionados y refresque la lista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303 msgid "Show" msgstr "Mostrar" -#: ../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 "" @@ -5686,8 +5849,7 @@ #: ../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 "" -"Crea una copia de esta relación y la abre en otra ventana de edición." +msgstr "Crea una copia de esta relación y la abre en otra ventana de edición." #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 @@ -5728,25 +5890,25 @@ msgstr "Zoom a la selección" -#: ../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 "Sel.: Rel.:{0} / Vías:{1} / Nodos:{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 "Selección" -#: ../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 "Selección: {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 "Desacoplar el panel" -#: ../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." @@ -5755,5 +5917,5 @@ "herramientas de la izquierda." -#: ../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 "Haga click para minimizar/maximizar el contenido del panel" @@ -5815,37 +5977,37 @@ msgstr "Nº de objetos" -#: ../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 "Descargar todas las relaciones hijo (recursivamente)" -#: ../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 "Descargar Todos los Hijos" -#: ../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 "Descargar las relaciones selecionadas" -#: ../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 "Descargar los hijos seleccionados" -#: ../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 "Descargar relación de miembros" -#: ../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 "Conflictos en dato" -#: ../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 "" @@ -5854,63 +6016,91 @@ 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 "La relación se ha borrado" -#: ../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 "Descargando relación {0}" -#: ../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/GenericRelationEditor.java:158 +#: ../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] "Descargar todas las vías y nodos incompletos de esta relación" +msgstr[1] "Descargar todas las vías y nodos incompletos de esta relación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Descargar relación de miembros" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "Descargando relación {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 msgid "Tags and Members" msgstr "Etiquetas y miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 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 "Aplicar función" + +#: ../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 "Fijar una función para los miembros seleccionados" + +#: ../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 "Eliminarlos, limpiar la relación" -#: ../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 "Ignorarlos, dejar la relación como está" -#: ../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 "" @@ -5920,15 +6110,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 " @@ -5936,5 +6126,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 " @@ -5942,20 +6132,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 "" @@ -5964,66 +6154,69 @@ 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 "Ordenar los miembros de la relación" -#. 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 +msgid "Sort" +msgstr "Ordenar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 msgid "Relation Editor: Sort" msgstr "Editor de relaciones: Ordenar" -#: ../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 "Mover los miembro(s) seleccionos hacia arriba" #. 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 "Editor de relaciones: Mover arriba" -#: ../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 "Mover los miembros seleccionados hacia abajo" #. 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 "Editor de relaciones: Mover abajo" -#: ../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 "Editor de relaciones: Borrar" -#: ../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 "Sí, crear un conflicto y cerrar" -#: ../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 "No, continuar editando" +#: ../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 " @@ -6032,53 +6225,60 @@ 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 "Conflicto en los datos" -#: ../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 "Aplicar las actualizaciones actuales" -#: ../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 "Aplicar las actualizaciones y cerrar el diálogo" -#: ../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 "Cancelar las actualizaciones y cerrar el cuadro de diálogo" -#: ../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 "Añadir una etiqueta vacía" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 -msgid "Download all incomplete ways and nodes in relation" -msgstr "Descargar todas las vías y nodos incompletos de esta relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#, fuzzy +msgid "Download all incomplete members" +msgstr "Descargar relación de miembros" + +#: ../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 "Descargar miembros" -#: ../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 +#, fuzzy +msgid "Download selected incomplete members" +msgstr "Descargar relación de miembros" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 msgid "Sets a role for the selected members" msgstr "Fijar una función para los miembros seleccionados" -#: ../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 "Aplicar función" -#: ../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 "" @@ -6088,41 +6288,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 "Sí, aplícalo" -#: ../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 "No, no lo apliques" -#: ../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 "Confirmar función vacía" -#: ../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 "Ampliar a" -#: ../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 "" @@ -6162,19 +6355,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 "Aplicar cambios" -#: ../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 "Crear una nueva relación en la capa \"{0}\"" -#: ../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 "Editar una nueva relación en la capa \"{0}\"" -#: ../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}''" @@ -6186,6 +6379,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 "" @@ -6368,7 +6560,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 "" @@ -7141,5 +7332,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 @@ -7376,6 +7567,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 "" @@ -7385,6 +7576,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 "" @@ -7647,13 +7838,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 "Información del conjunto de cambios" -#: ../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}" @@ -7754,6 +7945,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 "" @@ -7838,6 +8028,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] "" @@ -7851,6 +8041,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 " @@ -7907,5 +8097,5 @@ msgstr "Preparando capa ''{0}'' para subir..." -#: ../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 " @@ -7913,5 +8103,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 "" @@ -7984,40 +8174,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 "Subir" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 msgid "Settings" msgstr "Preferencias" -#: ../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 "Etiquetas del nuevo conjunto de cambios" -#: ../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 "Objetos que añadir:" -#: ../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 "Objetos que modificar:" -#: ../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 "Objetos que eliminar:" -#: ../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:" @@ -8026,5 +8216,5 @@ msgstr[1] "{0} objetos para añadir:" -#: ../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:" @@ -8033,5 +8223,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:" @@ -8040,71 +8230,68 @@ msgstr[1] "{0} objetos para eliminar:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 msgid "Upload Changes" msgstr "Subir cambios" -#: ../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 "Por favor, introduzca las coordenadas deseadas primero." + +#: ../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 "" -"Permitir subir todos los cambios en una petición, no permitir usar una " -"petición por cambio sencillo" - -#: ../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 "Introduzca un breve comentario sobre los cambios que se van a subir:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../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 "Abrir un nuevo conjunto de cambios" -#: ../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 "" "Abrir un nuevo conjunto de cambios y usarlo en la siguiente subida de datos" -#: ../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 "Usar un nuevo conjunto de cambios" -#: ../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 "Subir datos a un conjunto de cambios abierto" -#: ../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 "Cerrar conjunto de cambios despues de subir los datos" -#: ../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}" @@ -8112,16 +8299,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}." @@ -8129,6 +8316,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 "" @@ -8139,5 +8326,5 @@ "esta primitiva e intentando volver a enviar los cambios." -#: ../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 "Preparando primitivas para subir" @@ -8167,113 +8354,57 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Imágenes para {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "Leer gpx" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "No hay hora para el punto {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 "No pudo leerse la hora \"{0}\" desde el punto {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 "Leyendo {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "" -"No se han encontrado imágenes con metadatos legibles sobre la fecha y hora." - -#: ../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 "Imagenes Geoetiquetadas" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "Iniciar GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "Finalizar GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "delta actual: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "diferencia de zona horaria: " - -#: ../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] "imagen" -msgstr[1] "imagenes" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} dentro de la traza." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Sincronizar reloj" - -#: ../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 "Imágenes JPEG (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "" -"La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Imagen" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "Zona horaria del GPS (diferencia con la foto)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Sincronizar hora con la del receptor GPS" - -#: ../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 "La hora no pudo ser analizada sintácticamente." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, fuzzy, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "Atención: fallo al almacenar las preferencias en \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 +#, fuzzy +msgid "Upload data in one request" +msgstr "Subir al servidor todos los cambios en una sola solicitud" + +#: ../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 +#, fuzzy +msgid "(1 request)" +msgstr "Solicitud errónea" + +#: ../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} metros" +msgstr[1] "{0} metros" + +#: ../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 "Por favor, introduce una cadena de caracteres como filtro" + +#: ../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 @@ -8281,30 +8412,30 @@ msgstr "punto 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 "Personalice el dibujo de línea" -#: ../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 "Usar las preferencias globales" -#: ../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 "Dibujar líneas entre puntos para esta capa" -#: ../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 "No dibujar líneas entre puntos para esta capa" -#: ../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 "Seleccione las opciones de dibujo de línea" -#: ../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 @@ -8312,5 +8443,5 @@ msgstr "Personalizar colores" -#: ../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 @@ -8319,5 +8450,5 @@ msgstr "Predeterminado" -#: ../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 @@ -8326,58 +8457,63 @@ msgstr "Seleccionar una color" -#: ../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 "Marcadores desde puntos nombrados" -#: ../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 "Puntos de traza nombrados desde {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215 msgid "Import Audio" msgstr "Importar audio" -#: ../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 "archivos Wave Audio (*.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 "Marcadores de audio desde {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 "Importar imágenes" -#: ../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 "Imágenes JPEG (*.jpg)" + +#: ../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 "Nombre: {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 @@ -8385,5 +8521,5 @@ msgstr "Descripción: {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" @@ -8393,5 +8529,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 @@ -8399,22 +8535,17 @@ msgstr "Descripción" -#: ../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 "Longitud" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 -msgid "URL" -msgstr "URL" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443 msgid "Length: " msgstr "Longitud: " -#: ../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, " @@ -8423,5 +8554,5 @@ msgstr[1] "{0} rutas, " -#: ../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" @@ -8430,24 +8561,24 @@ msgstr[1] "{0} nodos de vía" -#: ../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 "Convertir en capa de datos" -#: ../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:" +#: ../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 "" "La subida de datos gps sin procesar como datos de mapa se considera " "peligroso.
Si quiere subir trazas, consulte aquí:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 (EN)" -#: ../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 @@ -8457,29 +8588,29 @@ msgstr "Convertido desde: {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 "Descargar datos de OSM a lo largo de esta traza" -#: ../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 "Descargar todo entre:" -#: ../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} metros" -#: ../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 "Área máxima por petición:" -#: ../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} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8487,12 +8618,12 @@ "wish
to continue?" msgstr "" -"Esta acción requiere {0} peticiones
individuales de " -"descarga." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 +"Esta acción requiere {0} peticiones
individuales de descarga." +"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 msgid "No GPX track available in layer to associate audio with." msgstr "No hay traza gpx disponible en la capa para asociar el audio" -#: ../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 " @@ -8503,5 +8634,5 @@ "comienzo." -#: ../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 " @@ -8511,23 +8642,23 @@ "tiempos fueran razonablemente estimados se han omitido." -#: ../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 "Capa de datos {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 "fuera del área descargada" -#: ../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 "versión {0}" -#: ../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." @@ -8536,5 +8667,5 @@ msgstr[1] "Se han detectado {0} conflictos." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 #, java-format msgid "" @@ -8548,5 +8679,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 "" @@ -8563,11 +8694,11 @@ "dialogo de Conflictos y resuélvalos manualmente." -#: ../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" @@ -8576,32 +8707,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} formado por:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 msgid "unset" msgstr "sin ajustar" -#: ../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 "Versión del API: {0}" -#: ../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 "Convertir a capa de gpx" -#: ../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 "" @@ -8609,6 +8740,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 "" @@ -8647,4 +8778,365 @@ msgstr[1] "{0} puntos" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "Archivos GPX (*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "El archivo {0} ya está cargado con el nombre \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#, java-format +msgid "Error while parsing {0}" +msgstr "Error mientras se analizaba sintácticamente {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "No se pudo leer \"{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 "" +"Tome una foto de su receptor GPS mientras muestra la hora exacta." +"
Exponga esa foto aquí.
Y luego, simplemente tome la hora que usted " +"lee en la foto y seleccione una zona horaria
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Hora de la foto (desde exif)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "Hora del Gps (leída desde la foto tomada): " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [dd/mm/aaaa hh:mm:ss]" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +msgid "I'm in the timezone of: " +msgstr "Yo estoy en la zona horaria de: " + +#: ../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 "Sin fecha" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "Abrir otra foto" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +msgid "Synchronize time from a photo of the GPS receiver" +msgstr "sincronizar el tiempo de una foto con el receptor GPS" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"Error al analizar la fecha.\n" +"Por favor, utilice el formato requerido." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "Fecha no válida" + +#: ../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 "Traza GPX: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Abrir otra traza gpx" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +msgid "Timezone: " +msgstr "Zona horaria: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +msgid "Offset:" +msgstr "Ajuste:" + +#: ../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 "" +"No puedo tomar una imagen de mi receptor GPS
¿Puede ayudarme?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 +msgid "Update position for: " +msgstr "Actualizar posición para: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 +msgid "All images" +msgstr "Todas las imágenes" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 +msgid "Images with no exif position" +msgstr "Imágenes sin la posición exif" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 +msgid "Not yet tagged images" +msgstr "Fotos no etiquetadas todavía" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +msgid "Correlate images with GPX track" +msgstr "Correlacionar las imágenes con la traza GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Correlate" +msgstr "Correlación" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Auto-Guess" +msgstr "Estimación automática" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +msgid "You should select a GPX track" +msgstr "Debe seleccionar una traza GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "No se ha seleccionado una traza GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Error al analizar la zona horaria.\n" +"Formato esperado: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +msgid "Invalid timezone" +msgstr "Zona horaria no válida" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Error mientras se realizaba el análisis sintáctico.\n" +"Formato esperado: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +msgid "Invalid offset" +msgstr "Desplazamiento inválido" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "Encontrado {0} coincidencias de{1} en la traza GPX {2}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "Traza GPX cargada" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 +msgid "The selected photos don't contain time information." +msgstr "" +"Las fotografías seleccionadas no contienen información sobre la hora en que " +"fueron tomadas." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 +msgid "Photos don't contain time information" +msgstr "Las fotografías no contiene información horaria" + +#: ../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 "" +"La traza GPX seleccionada no contiene información temporal. Por favor, " +"seleccione otra." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "La traza GPX no posee información horaria" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "Zona horaria: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "Minutos: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "Segundos: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Ajustadas al track GPS {0} de {1} fotografías" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "(Diferencia horaria de {0} días)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "Diferencia temporal entre la traza y las fotografías: {0}m {1}s" + +#: ../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 "" +"Se produjo un error al tratar de relacionar las fotos con la pista GPX. " +"Puedes ajustar los controles deslizantes para coincidir las fotos de forma " +"manual." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 +msgid "Matching photos to track failed" +msgstr "Ajuste de fotografías a traza fallido" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +msgid "Adjust timezone and offset" +msgstr "Ajustar zona horaria y la diferencia temporal" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +msgid "Default Values" +msgstr "Valores por defecto" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +msgid "Extracting GPS locations from EXIF" +msgstr "Extrayendo localizaciones GPS del EXIF" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +msgid "Starting directory scan" +msgstr "Iniciando escaneo del directorio" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +msgid "One of the selected files was null" +msgstr "Uno de los archivos seleccionados era nulo" + +#: ../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 "Leyendo fotos..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "Leyendo {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 "Imposible obtener ruta apropiada para el directorio {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "Escaneando directorio {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "Encontrado archivo nulo en el directorio {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Error mientras se obtenían archivos del directorio {0}\n" + +#: ../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 "Imagenes Geoetiquetadas" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "Correlacionar con GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "imagen" +msgstr[1] "imagenes" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "Se encontraron {0} geoetiquetadas." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +msgid "No image" +msgstr "Ninguna imagen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "Cargando {0}" + +#: ../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 "Error en archivo {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Mostrar fotos geoetiquetadas" + +#: ../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 "Anterior" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Eliminar foto de la capa" + +#: ../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 "Siguiente" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "Centrar vista" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +msgid "Zoom best fit and 1:1" +msgstr "Zoom a mejor ajuste y 1:1" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#, java-format +msgid "" +"\n" +"Altitude: {0} m" +msgstr "" +"\n" +"Altitud: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8732,6 +9224,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 msgid "There was an error while trying to display the URL for this marker" -msgstr "" -"Ha habido un error cuando se intentaba mostrar la URL de este marcador" +msgstr "Ha habido un error cuando se intentaba mostrar la URL de este marcador" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 @@ -8974,5 +9465,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 @@ -9172,6 +9663,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 "" "Dibujar flechas de dirección usando visualizaciones de tablas en vez de " @@ -9239,6 +9729,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 "" "Aplicar antialias a la vista del mapa da como resultado una apariencia más " @@ -9310,19 +9799,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 "Visualización y comportamiento" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Idioma" + +#: ../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 "Por defecto (determinado automáticamente)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Idioma" - -#: ../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 @@ -9582,6 +10071,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 "" @@ -9646,6 +10135,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 "" "

Además, los atajos de teclado se activan cuando las acciones se asignan a " @@ -9663,9 +10152,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 "" "

Debe saber que la lista de selección de teclas de la siguiente página, " @@ -9706,6 +10194,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 "" "

El pseudo modificador \"desactivar\" desactivará el atajo de teclado " @@ -9800,5 +10288,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 "Más información sobre esta característica" @@ -9885,5 +10373,5 @@ msgstr "Descargando puntos {0} al {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 @@ -9891,5 +10379,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -10013,14 +10501,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 @@ -10048,24 +10535,31 @@ 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 "Obteniendo un conjunto de nodos de ''{0}''" -#: ../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 "Obteniendo un conjunto de vías de ''{0}''" -#: ../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 "Obteniendo un conjunto de relaciones de ''{0}''" -#: ../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] "Descargando puntos {0} al {1}..." +msgstr[1] "Descargando puntos {0} al {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10107,30 +10601,29 @@ 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 "Esta versión de JOSM es incompatible con el servidor configurado" -#: ../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}." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#, fuzzy, java-format +msgid "" +"It supports protocol version 0.6, while the server says it supports {0} to " +"{1}." msgstr "" "Soporta versiones 0.5 y 0.6 del protocolo, pero el servidor dice que soporta " "{0} a {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 #, java-format msgid "Communications with {0} established using protocol version {1}." -msgstr "" -"Establecidas comunicaciones con {0} usando la versión de protocolo {1}" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 +msgstr "Establecidas comunicaciones con {0} usando la versión de protocolo {1}" + +#: ../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 "" @@ -10138,66 +10631,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 "Conjunto de cambios {0} abierto con éxito" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 msgid "Updating changeset..." msgstr "Actualizando conjunto de cambios..." -#: ../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 "Actualizando conjunto de cambios {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 msgid "Closing changeset..." msgstr "Cerrando conjunto de cambios..." -#: ../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 "Sin nuevos cambios que enviar" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "Preparing..." msgstr "Preparando…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Subiendo..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Waiting 10 seconds ... " msgstr "Esperando 10 segundos... " -#: ../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 "Reintentando {0} de {1} en {2} segundos..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 msgid "OK - trying again." msgstr "OK - intentando de nuevo." -#: ../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 "Reintentando {0} de {1}." -#: ../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 "El conjunto de cambios actual es nulo. Los datos no se pueden subir." -#: ../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}." @@ -10232,5 +10725,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}''." @@ -10257,5 +10750,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}." @@ -10263,5 +10756,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}" @@ -10274,5 +10767,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}''." @@ -10332,7 +10825,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 "" "ADVERTENCIA: La clave es almacena en texto plano en el archivo de " @@ -10363,6 +10856,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 "" @@ -10436,46 +10929,45 @@ msgstr "El archivo \"{0} no existe" -#: ../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 "Valor ilegal del atributo \"ref\" del elemento . Es {0}." -#: ../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 "" @@ -10483,19 +10975,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 "Especificación incompleta sin ref=0" -#: ../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 "Objeto con id=0 ilegal" -#: ../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 "" @@ -10505,8 +10997,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 "" @@ -10516,25 +11008,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 "Versión del API desconocida o no soportada. Es {0}." -#: ../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 "" @@ -10542,5 +11034,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10549,5 +11041,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10555,5 +11047,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10562,13 +11054,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 "Preparando datos OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 msgid "Parsing OSM data..." msgstr "Analizando los datos de OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 msgid "Preparing data set..." msgstr "Preparando conjunto de datos..." @@ -10622,4 +11114,10 @@ msgstr "Contactando con el servidor..." +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 +#, fuzzy, java-format +msgid "Expected value > 0 for parameter ''{0}'', got {1}" +msgstr "inexperado valor del parámetro \"index\". Obtenido {0}" + #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 #, java-format @@ -10629,6 +11127,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 msgid "Error: failed to add authentication credentials to the connection." -msgstr "" -"Error: fallo al añadir credenciales de autentificación a la conexión." +msgstr "Error: fallo al añadir credenciales de autentificación a la conexión." #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 @@ -10661,43 +11158,45 @@ "{2}." -#: ../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 "Comenzando a subir en un única petición por primitiva..." -#: ../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 "{0}% ({1}/{2}), {3} restantes. Subiendo nodo ''{4}'' (id: {5})" -#: ../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 "{0}% ({1}/{2}), {3} restantes. Subiendo vía ''{4}'' (id: {5})" -#: ../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 "{0}% ({1}/{2}), {3} restantes. Subiendo relación ''{4}'' (id: {5})" -#: ../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 "Comenzando a subir en un única petición..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#, fuzzy, java-format +msgid "Value >0 expected for parameter ''{0}'', got {1}" +msgstr "inexperado valor del parámetro \"index\". Obtenido {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 +#, fuzzy +msgid "Starting to upload in chunks..." +msgstr "Comenzando a subir en un única petición..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#, fuzzy, java-format +msgid "({0}/{1}) Uploading {2} objects..." +msgstr "Subiendo {0} objetos..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "Subiendo datos..." - -#: ../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 "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10738,17 +11237,27 @@ msgstr "Descargando complemento {0}..." -#: ../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 "Borrar {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Error al borrar el archivo del complemento: {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 msgid "Skip download" msgstr "Saltar descarga" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Download Plugin" msgstr "Descargar complemento" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Skip Download" msgstr "Omitir la descarga" -#: ../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}." @@ -10760,19 +11269,18 @@ msgstr "Ha ocurrido un error en el complemento {0}" -#: ../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" @@ -10785,24 +11293,24 @@ "¿Desea actualizar los componentes ahora?" -#: ../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 "La última actualización de los complementos fue hace más de {0} días" -#: ../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 "Actualizar complementos" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 msgid "Skip update" msgstr "Omitir actualización" -#: ../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 "El complemento {0} requiere una actualizar JOSM a la versión {1}" -#: ../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." @@ -10811,10 +11319,10 @@ "encontrado" -#: ../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 "Complemento no encontrado: {0}." -#: ../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?" @@ -10822,16 +11330,16 @@ "No se puede cargar el complemento {0}. ¿Desea borrarlo de las preferencias?" -#: ../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 "Deshabilitar complemento" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Keep plugin" msgstr "Mantener componente" -#: ../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 " @@ -10841,22 +11349,22 @@ "permiso para escribir sobre los existentes" -#: ../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 "" "An unexpected exception occurred that may have come from the ''{0}'' plugin." msgstr "" -"Sucedió una excepción imprevista. Pudo ser originada por el componente " -"\"{0}\"." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318 +"Sucedió una excepción imprevista. Pudo ser originada por el componente \"{0}" +"\"." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:319 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "De acuerdo a la información del componente, el autor es {0}." -#: ../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." @@ -10865,9 +11373,9 @@ "informar del error." -#: ../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 "¿Se debe deshabilitar el complemento?" -#: ../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 " @@ -10877,14 +11385,14 @@ "JOSM para descargarle del programa." -#: ../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 "" "El componente no puede ser eliminado. Probablemente ya estaba desabilitado" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:386 msgid "Plugin information" msgstr "Información del complemento" -#: ../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" @@ -11003,6 +11511,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 "" @@ -11040,10 +11548,10 @@ 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 "" " Subida al servidor fallida debido a que su actual " -"conjunto de datos
viola una condición previa.
El mensaje de error " -"es:
{0}" +"conjunto de datos
viola una condición previa.
El mensaje de error es:" +"
{0}" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 @@ -11111,11 +11619,10 @@ #, java-format msgid "" -"The OSM server
''{0}''
reported an internal server " -"error.
This is most likely a temporary problem. Please try again " -"later." -msgstr "" -"El servidor OSM
''{0}''
informa de un error de servidor " -"interno.
Esto suele ser un problema temporal. Inténtelo de nuevo más " -"tarde, por favor." +"The OSM server
''{0}''
reported an internal server error." +"
This is most likely a temporary problem. Please try again later." +msgstr "" +"El servidor OSM
''{0}''
informa de un error de servidor interno." +"
Esto suele ser un problema temporal. Inténtelo de nuevo más tarde, por " +"favor." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 @@ -11126,7 +11633,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 "" "El área que intentó descargar es demasiado grande o su solicitud era " @@ -11161,6 +11668,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 "" @@ -11213,6 +11720,6 @@ "\n" msgstr "" -"No se pudo establecer el atajo de teclado \"{0}\" para la acción \"{1}\" " -"({2})\n" +"No se pudo establecer el atajo de teclado \"{0}\" para la acción \"{1}" +"\" ({2})\n" "porque ese atajo está actualmente establecido para \"{3}\" ({4}).\n" "\n" @@ -11429,5 +11936,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" @@ -11442,12 +11949,10 @@ msgstr "Definir método de interpolación de número de portales" -#. 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 "Impar" -#: ../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 @@ -11455,59 +11960,94 @@ msgstr "Par" -#: ../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 "Alfabético" -#: ../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 "Número" + +#. 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 "espacio natural" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "sitio" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Alquiler" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 #, java-format msgid "Relation: {0}" msgstr "Relación: {0}" -#: ../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 "Asociar a la calle usando:" -#: ../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 "Esquema de numeración:" -#: ../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 "segmento interior" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 msgid "Starting #:" msgstr "Comenzando #:" -#: ../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 "Nº final:" -#: ../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 "Asociará {0} nodos de numeros de portal adicionales" -#: ../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 "Ciudad:" -#: ../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 "Estado/Provincia:" -#: ../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 "Código postal:" -#: ../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 "País:" -#: ../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 "Dirección completa:" -#: ../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 "Información opcional:" -#: ../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 "" @@ -11515,22 +12055,27 @@ "interpoladas" -#: ../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 "" "Por favor, seleccione una vía de direcciones interpoladas para esta calle" -#: ../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 "Se preveía número de portal impar" -#: ../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 "Se preveía número de portal par" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093 +#, fuzzy +msgid "Expected valid number for address increment" +msgstr "Se preveía número de portal impar" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 msgid "Country code must be 2 letters" msgstr "El código de país debe tener 2 letras" -#: ../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 "" @@ -11538,9 +12083,9 @@ "de portal" -#: ../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 "El número de portal alfabético debe terminar con una letra" -#: ../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 "" @@ -11548,379 +12093,21 @@ "alfabética" -#: ../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 "" "La letra del portal de inicio debe ser inferior a la letra del último portal" -#: ../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 "Por favor, introduzca un número valido para el portal de inicio" -#: ../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 "Por favor, introduzca un número valido para el portal final" -#: ../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 "" "El número de portal de inicio debe ser menor que el número del último portal." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "AgPifoJ - Geotagged pictures" -msgstr "AgPifoJ - Fotos geoetiquetadas" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "Mostrar fotos geoetiquetadas" - -#: ../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 "Anterior" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Eliminar foto de la capa" - -#: ../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 "Siguiente" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "Centrar vista" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102 -msgid "Zoom best fit and 1:1" -msgstr "Zoom a mejor ajuste y 1:1" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 -#, java-format -msgid "" -"\n" -"Altitude: {0} m" -msgstr "" -"\n" -"Altitud: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/h" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "Extrayendo localizaciones GPS del EXIF" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121 -msgid "Starting directory scan" -msgstr "Iniciando escaneo del directorio" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:126 -msgid "One of the selected files was null" -msgstr "Uno de los archivos seleccionados era nulo" - -#: ../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 "Leyendo fotos..." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:186 -#, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "Imposible obtener ruta apropiada para el directorio {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "Escaneando directorio {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "Encontrado archivo nulo en el directorio {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Error mientras se obtenían archivos del directorio {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "Correlacionar con GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "Se encontraron {0} geoetiquetadas." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "abrir imágenes con AgPifoJ..." - -#: ../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 "Cargar el conjunto de imágenes como una nueva capa." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "Archivos GPX (*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "El archivo {0} ya está cargado con el nombre \"{1}\"" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#, java-format -msgid "Error while parsing {0}" -msgstr "Error mientras se analizaba sintácticamente {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "No se pudo leer \"{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 "" -"Tome una foto de su receptor GPS mientras muestra la hora " -"exacta.
Exponga esa foto aquí.
Y luego, simplemente tome la hora que " -"usted lee en la foto y seleccione una zona horaria
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Hora de la foto (desde exif)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "Hora del Gps (leída desde la foto tomada): " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [dd/mm/aaaa hh:mm:ss]" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 -msgid "I'm in the timezone of: " -msgstr "Yo estoy en la zona horaria de: " - -#: ../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 "Sin fecha" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "Abrir otra foto" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 -msgid "Synchronize time from a photo of the GPS receiver" -msgstr "sincronizar el tiempo de una foto con el receptor GPS" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"Error al analizar la fecha.\n" -"Por favor, utilice el formato requerido." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "Fecha no válida" - -#: ../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 "Traza GPX: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Abrir otra traza gpx" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -msgid "Timezone: " -msgstr "Zona horaria: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 -msgid "Offset:" -msgstr "Ajuste:" - -#: ../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 "" -"No puedo tomar una imagen de mi receptor GPS
¿Puede " -"ayudarme?" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Actualizar posición para: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Todas las imágenes" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Imágenes sin la posición exif" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Fotos no etiquetadas todavía" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 -msgid "Correlate images with GPX track" -msgstr "Correlacionar las imágenes con la traza GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Correlate" -msgstr "Correlación" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Estimación automática" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "Debe seleccionar una traza GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "No se ha seleccionado una traza GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Error al analizar la zona horaria.\n" -"Formato esperado: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Zona horaria no válida" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Error mientras se realizaba el análisis sintáctico.\n" -"Formato esperado: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Desplazamiento inválido" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Encontrado {0} coincidencias de{1} en la traza GPX {2}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "Traza GPX cargada" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" -"Las fotografías seleccionadas no contienen información sobre la hora en que " -"fueron tomadas." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Las fotografías no contiene información horaria" - -#: ../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 "" -"La traza GPX seleccionada no contiene información temporal. Por favor, " -"seleccione otra." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "La traza GPX no posee información horaria" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Zona horaria: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minutos: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Segundos: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Ajustadas al track GPS {0} de {1} fotografías" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Diferencia horaria de {0} días)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Diferencia temporal entre la traza y las fotografías: {0}m {1}s" - -#: ../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 "" -"Se produjo un error al tratar de relacionar las fotos con la pista GPX. " -"Puedes ajustar los controles deslizantes para coincidir las fotos de forma " -"manual." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "Ajuste de fotografías a traza fallido" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Ajustar zona horaria y la diferencia temporal" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Valores por defecto" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433 -msgid "No image" -msgstr "Ninguna imagen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "Cargando {0}" - -#: ../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 "Error en archivo {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -12066,19 +12253,17 @@ #: ../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 "" "Un componente especial para el manejo del servidor WMS del catastro francés " "en www.cadastre.gouv.fr

Por favor, lea los Términos y Condiciones de " -"Uso aquí (en francés):
" -"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " -"
antes de subir cualquier dato creado mediante este componente." +"Uso aquí (en francés):
http://www.cadastre.gouv.fr/scpc/html/" +"CU_01_ConditionsGenerales_fr.html
antes de subir cualquier dato " +"creado mediante este componente." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 @@ -12401,12 +12586,4 @@ msgstr "Exportar como formato PNG (solo imágenes raster)" -#: ../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] "Vía simplificada (eliminado {0} nodo)" -msgstr[1] "Vía simplificada (eliminados {0} nodos)" - #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 @@ -12522,14 +12699,14 @@ msgstr "Esquemas de color" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 +#: ../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 "Dividir área" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 msgid "Splits an area by an untagged way." msgstr "Dividir una área mediante una vía sin etiquetar" -#: ../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 " @@ -12742,6 +12919,6 @@ msgstr "" "No se puede cargar la biblioteca rxtxSerial. Si usted necesita ayuda para " -"instalarla inténtelo en la página web GlobalSat : http://www.raphael-" -"mack.de/josm-globalsat-gpx-import-plugin/" +"instalarla inténtelo en la página web GlobalSat : http://www.raphael-mack.de/" +"josm-globalsat-gpx-import-plugin/" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 @@ -12843,4 +13020,8 @@ msgstr "Abrir imágenes con ImageWayPoint" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Cargar el conjunto de imágenes como una nueva capa." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -12884,18 +13065,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 "Ejecutando reducción de vértices..." -#: ../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 "Ejecutando aproximación Douglas-Peucker..." -#: ../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 "Eliminando nodos duplicados..." -#: ../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" @@ -12944,7 +13125,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12954,5 +13135,5 @@ #. 50000 #. -#. +#. #. #. @@ -12962,5 +13143,5 @@ #. 50000 #. -#. +#. #. #. @@ -12969,5 +13150,5 @@ #. 50000 #. -#. +#. #. #. @@ -12977,5 +13158,5 @@ #. 50000 #. -#. +#. #. #. @@ -13053,6 +13234,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 "" "Máximo numero de segmentos permitidos en cada vía generada. Por Defecto 250." @@ -13076,7 +13256,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 "" "Precisión en la simplificación de línea Douglas-Peucker, medido en grados. " @@ -13101,6 +13280,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76 msgid "Offset all points in North direction (degrees). Default 0." -msgstr "" -"Trasladar todos los puntos en dirección Norte (por defecto 0 grados)." +msgstr "Trasladar todos los puntos en dirección Norte (por defecto 0 grados)." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77 @@ -13146,20 +13324,19 @@ msgstr "No se a podido adquirir la imagen" -#: ../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 "Conectando" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Conectado" -#. 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 "No conectado" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "Falló la conexión" @@ -13290,6 +13467,5 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32 msgid "Adds no left turn for sets of 4 or 5 ways." -msgstr "" -"Añadir giros prohibidos a la izquierda para el conjunto de 4 o 5 vías." +msgstr "Añadir giros prohibidos a la izquierda para el conjunto de 4 o 5 vías." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 @@ -13359,7 +13535,7 @@ "new server? (Strongly recommended)" msgstr "" -"El componente OpenStreetBugs usa el antiguo servidor de " -"appspot.com.
Un nuevo servidor está disponible en schokokeks.org.
" -"¿Quiere cambiar al nuevo servidor? (Recomendado)" +"El componente OpenStreetBugs usa el antiguo servidor de appspot.com." +"
Un nuevo servidor está disponible en schokokeks.org.
¿Quiere " +"cambiar al nuevo servidor? (Recomendado)" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 @@ -13387,6 +13563,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 "" "La cabecera contiene varios valores y no puede ser transferida a una sola " @@ -13432,6 +13607,6 @@ "comment:" msgstr "" -"¿Desea realmente marcar marcar está cuestión como " -"\"hecha\"?

Puedes añadir una comentario opcional:" +"¿Desea realmente marcar marcar está cuestión como \"hecha\"?" +"

Puedes añadir una comentario opcional:" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64 @@ -13473,9 +13648,10 @@ msgstr "Extensión de archivos desconocida: {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 "Osmarender" -#: ../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 " @@ -13485,9 +13661,5 @@ "pestaña Configuraciones del Mapa del menú Preferencias." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "Opciones de osmarender" - -#: ../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 "Ejecutable Firefox" @@ -13870,17 +14042,17 @@ "preferencias." -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" msgstr "Invertir edificios adosados" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37 msgid "Reverses house numbers on a terrace." msgstr "Invertir los números de portal de edificios adosados" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 msgid "Reverse a Terrace" msgstr "Invertir edificios adosados" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110 msgid "Reverse Terrace" msgstr "Invertir edificios adosados" @@ -13924,170 +14096,4 @@ msgid "Optional" msgstr "Opcional" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "Unir áreas superpuestas" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Joins areas that overlap each other" -msgstr "Unir áreas que se superponen con otras" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 -msgid "Only up to two areas can be joined at the moment." -msgstr "Sólo un máximo de dos áreas pueden unirse por el momento." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 -#, java-format -msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "\"{0}\" no está cerrado y, por tanto, no se puede unir." - -#: ../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 "" -"La(s) vía(s) seleccionadas tienen nodos fuera del área descargada.\n" -"Esto puede acabar con nodos borrados accidentalmente.\n" -"¿Está seguro de continuar?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 -msgid "Please abort if you are not sure" -msgstr "Por favor, abortar si usted no está seguro" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 -msgid "Please select at least one closed way the should be joined." -msgstr "Por favor, seleccione al menos un vial cerrado para ser unido." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175 -msgid "No intersection found. Nothing was changed." -msgstr "No se encontró ninguna intersección. Nada ha cambiado." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197 -msgid "Added node on all intersections" -msgstr "Nodo añadido en todas las intersecciones" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221 -msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "Eliminar vías que no formen parte de un multipolígono interior" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226 -msgid "Fix relations" -msgstr "Arreglar relaciones" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 -msgid "Joined self-overlapping area" -msgstr "Fusionar área superpuesta consigo misma" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 -msgid "Joined overlapping areas" -msgstr "Fusionar áreas superpuestas" - -#: ../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 "" -"Algunas de las vías forman que parte de relaciones han sido modificados. Por " -"favor, compruebe los errores no se han introducido." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 -msgid "Enter values for all conflicts." -msgstr "Introduzca valores para todos los conflictos." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Resolver conflictos" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312 -msgid "Fix tag conflicts" -msgstr "Arreglar conflictos de etiquetas" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462 -msgid "Removed Element from Relations" -msgstr "Eliminar elementos de las relaciones" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571 -msgid "Join Areas: Remove Short Ways" -msgstr "Fusionar áreas: eliminar las vías cortas" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587 -msgid "Closed Way" -msgstr "Vía cerrada" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854 -msgid "Remove tags from inner ways" -msgstr "Eliminar etiquetas de vías internas" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883 -msgid "Join Areas Function" -msgstr "Función para la fusión de áreas" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Jump To Position" -msgstr "Salta a la posición" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Opens a dialog that allows to jump to a specific location" -msgstr "" -"Abre una ventana de diálogo que permite desplazarse a una localización " -"especifica" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 -msgid "Enter Lat/Lon to jump to position." -msgstr "Introduzca Lat/Lon para ir a la posición." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 -msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "También puedes pegar una dirección URL de www.openstreetmap.org" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 -msgid "Zoom (in metres)" -msgstr "Zoom (en metros)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -msgid "Jump there" -msgstr "Ir allí" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 -msgid "Jump to Position" -msgstr "Salta a la posición" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Could not parse Latitude, Longitude or Zoom. Please check." -msgstr "" -"Imposible analizar la Longitud, Latitud y Zoom. Por favor, verifíquelo." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Unable to parse Lon/Lat" -msgstr "Imposible analizar sintácticamente Lon/Lat" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Simplify Way" -msgstr "Simplificar vía" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Eliminar nodos innecesarios de una vía." - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "Por favor, seleccione al menos una para simplificar." - -#: ../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] "" -"La selección contiene {0} vía. ¿Está seguro que quiere simplificarla?" -msgstr[1] "" -"La selección contiene {0} vías. ¿Está seguro que quiere simplificarlas todas?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "¿Está usted seguro?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14189,5 +14195,5 @@ msgstr "otra validación" -#: ../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}" @@ -14240,34 +14246,34 @@ msgstr "Ignorar los errores selecionados la próxima vez." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Todo el grupo" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Solo los elementos" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Ninguno" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "¿Ignorar todo el grupo o los elementos individuales?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 msgid "Ignoring elements" msgstr "Ignorando elementos" -#: ../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 "Corrigiendo errores..." -#: ../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 "Corrigiendo ({0}/{1}): ''{2}''" -#: ../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 "Actualizando mapa..." @@ -14318,18 +14324,18 @@ msgstr "Cruce de vías" -#: ../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 "Nodos duplicados" -#: ../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 "Esta examen comprueba que no haya nodos en el mismo lugar." -#: ../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 "Nodos en la misma posición" -#: ../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 "Confirmación" @@ -14574,7 +14580,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 "" "Los archivos de datos de las fuentes (URL o nombre de archivo) del corrector " @@ -14722,5 +14727,5 @@ #. 50000 #. -#. +#. #. #. @@ -14728,5 +14733,5 @@ #. #. -#. +#. #. #. @@ -14736,5 +14741,5 @@ #. 50000 #. -#. +#. #. #. @@ -14743,5 +14748,5 @@ #. 50000 #. -#. +#. #. #. @@ -14750,5 +14755,5 @@ #. 50000 #. -#. +#. #. #. @@ -14757,5 +14762,5 @@ #. 50000 #. -#. +#. #. #. @@ -14764,5 +14769,5 @@ #. 50000 #. -#. +#. #. #. @@ -14771,9 +14776,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14818,5 +14823,5 @@ #. 50000 #. -#. +#. #. #. @@ -14931,6 +14936,6 @@ "Display a map that was previously scanned and uploaded to walking-papers.org" msgstr "" -"Mostrar un mapa que estaba anteriormente escaneado y subido a walking-" -"papers.org" +"Mostrar un mapa que estaba anteriormente escaneado y subido a walking-papers." +"org" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 @@ -14960,14 +14965,14 @@ msgstr "Walking Papers" -#: ../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 " @@ -14976,14 +14981,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 "" @@ -14992,5 +14997,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 "" @@ -15002,13 +15007,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 +msgstr "¿Fusionar nodos duplicados?" + +#: ../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." @@ -15175,50 +15180,50 @@ "o cambe la resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "Descargar las teselas visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "Cambiar resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Reload erroneous tiles" msgstr "Recargar teselas erróneas" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Alpha channel" msgstr "Canal alfa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:369 msgid "Save WMS layer to file" msgstr "Guardar capa WMS como archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "Salvar capa WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "Cargar capa WMS desde archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "Cargar capa WMS" -#: ../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 "Versión de archivo WMS no soportada; encontrada {0}, esperada {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "File Format Error" msgstr "Error en el formato del archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "Error al leer el archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -15239,6 +15244,6 @@ msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -"Modificar la lista de servidores WMS mostrados en el menú del componente WMS " -"\n" +"Modificar la lista de servidores WMS mostrados en el menú del componente " +"WMS \n" "(seleccionar de la lista inferior de servidores posibles y pulsar botón " "\"añadir\" \n" @@ -15299,5 +15304,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 "" @@ -15339,20 +15344,11 @@ #. Plugin AddrInterpolation #: build/trans_plugins.java:3 -msgid "Group common Address Interpolation inputs in a single dialog," -msgstr "" -"Agrupar las entradas comunes de \tinterpolación de direcciones en un único " -"diálogo," - -#. 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 "" -"Otro complemento de geoetiquetado para JOSM. Se relaciona las fotografías " -"con la traza del GPS o importa los metadatos geográficos EXIF de las fotos." - -#. Plugin cadastre-fr -#: build/trans_plugins.java:7 msgid "A special handler for the French land registry WMS server." msgstr "" @@ -15361,5 +15357,5 @@ #. Plugin colorscheme -#: build/trans_plugins.java:9 +#: build/trans_plugins.java:7 msgid "" "Allows the user to create different color schemes and to switch between " @@ -15376,10 +15372,10 @@ #. Plugin Create_grid_of_ways -#: build/trans_plugins.java:11 +#: build/trans_plugins.java:9 msgid "Create a grid of ways." msgstr "Crea una cuadrícula de viales" #. Plugin czechaddress -#: build/trans_plugins.java:13 +#: build/trans_plugins.java:11 msgid "" "Creating and handling address nodes and buildings within Czech Republic." @@ -15387,10 +15383,10 @@ #. Plugin dataimport -#: build/trans_plugins.java:15 +#: build/trans_plugins.java:13 msgid "Allows to import various file formats into JOSM directly." msgstr "Permite importar directamente distintos formatos de archivo en JOSM." #. Plugin DirectUpload -#: build/trans_plugins.java:17 +#: build/trans_plugins.java:15 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " @@ -15401,10 +15397,10 @@ #. Plugin Duplicate-Way -#: build/trans_plugins.java:19 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "Duplicado de vías con cierto desplazamiento unas de otras" #. Plugin editgpx -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -15415,7 +15411,6 @@ #. Plugin globalsat -#: build/trans_plugins.java:23 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" "Descargar puntos GPS desde el registrador de datos GlobalSat DG100 " @@ -15423,16 +15418,15 @@ #. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "Visualiza la información de enrutamiento como un gráfico de enrutado." + +#. Plugin grid #: build/trans_plugins.java:25 -msgid "Visualizes routing information as a routing graph." -msgstr "" -"Visualiza la información de enrutamiento como un gráfico de enrutado." - -#. Plugin grid -#: build/trans_plugins.java:27 msgid "Provide a background layer that displays a map grid" msgstr "Proporciona una capa de fondo que muestra una rejilla en el mapa" #. Plugin ImageWayPoint -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -15446,10 +15440,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Ayuda a vectorizar imágenes WMS" #. Plugin livegps -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -15459,5 +15453,5 @@ #. Plugin measurement -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -15470,10 +15464,10 @@ #. Plugin michigan_left -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:35 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "No añadir ningún giro a la izquierda para conjuntos de 4 o 5 vías" #. Plugin multipoly -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:37 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -15484,5 +15478,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 " @@ -15496,10 +15490,10 @@ #. Plugin openlayers -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:41 msgid "Displays an OpenLayers background image" msgstr "Muestra una imágen OpenLayers de fondo" #. Plugin openstreetbugs -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:43 msgid "Imports issues from OpenStreetBugs" msgstr "" @@ -15508,5 +15502,5 @@ #. Plugin openvisible -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:45 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -15516,5 +15510,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:47 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -15524,5 +15518,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:49 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -15533,15 +15527,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:51 msgid "The great JGoodies Plastic Look and Feel." msgstr "El gran JGoodies Plastic Look and Feel." #. Plugin remotecontrol -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:53 msgid "Let other applications send commands to JOSM." msgstr "Dejar que otras aplicaciones envíen comandos a JOSM." #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15553,10 +15547,10 @@ #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:57 msgid "Provides routing capabilities." msgstr "Proporciona capacidades de enrutamiento." #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:59 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -15567,10 +15561,10 @@ #. Plugin surveyor -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:61 msgid "Allow adding markers/nodes on current gps positions." msgstr "Permite añadir marcadores/nodos a las posiciones GPS actual." #. Plugin tageditor -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:63 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" @@ -15579,5 +15573,5 @@ #. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:65 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -15591,19 +15585,10 @@ #. Plugin terracer -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:67 msgid "Make terraced houses out of single blocks." msgstr "Crea edificios entremedianeras a partir de bloques únicos" -#. 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 "" -"Varias utilidades que hacen la vida más fácil: por ejemplo, simplificar un " -"víal, unir áreas, moverse a un determinada posición, etc." - #. Plugin validator -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -15615,5 +15600,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15624,5 +15609,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -15630,5 +15615,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -15701,5 +15686,5 @@ #: build/trans_presets.java:69 msgid "Streets" -msgstr "Calles" +msgstr "Calles/Carreteras" #. group "Highways/Streets" @@ -16144,5 +16129,5 @@ #: build/trans_presets.java:221 build/trans_surveyor.java:84 msgid "Unclassified" -msgstr "Carretera sin denominación" +msgstr "Carretera sin clasificación" #. item "Highways/Streets/Unclassified" @@ -16152,5 +16137,5 @@ #: build/trans_presets.java:225 msgid "Edit Unclassified Road" -msgstr "Editar carretera sin denominación" +msgstr "Editar carretera sin clasificación" #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)" @@ -16683,8 +16668,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16828,5 +16813,5 @@ #: build/trans_presets.java:343 msgid "Public Service Vehicles (psv)" -msgstr "Vehiculos de servicio público (psv)" +msgstr "Vehículos de servicio público (SP)" #: build/trans_presets.java:344 @@ -16881,5 +16866,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16889,5 +16874,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16906,5 +16891,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16914,5 +16899,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16931,5 +16916,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16939,5 +16924,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16956,5 +16941,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16964,5 +16949,5 @@ #. 300000 #. -#. +#. #. #. @@ -16977,5 +16962,5 @@ #. 300000 #. -#. +#. #. #. @@ -16986,5 +16971,5 @@ #: build/trans_presets.java:361 msgid "unclassified" -msgstr "carretera sin denominación" +msgstr "carretera sin clasificación" #. color green @@ -16993,5 +16978,5 @@ #. 50000 #. -#. +#. #. #. @@ -17009,5 +16994,5 @@ #. 40000 #. -#. +#. #. #. @@ -17016,5 +17001,5 @@ #. 40000 #. -#. +#. #. #. @@ -17024,5 +17009,5 @@ #. 50000 #. -#. +#. #. #. @@ -17042,5 +17027,5 @@ #. 50000 #. -#. +#. #. #. @@ -17049,5 +17034,5 @@ #. 50000 #. -#. +#. #. #. @@ -17057,5 +17042,5 @@ #. 50000 #. -#. +#. #. #. @@ -17105,7 +17090,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17805,5 +17790,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17842,5 +17827,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17936,5 +17921,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -18091,5 +18076,5 @@ #. 50000 #. -#. +#. #. #. @@ -19187,5 +19172,5 @@ #: build/trans_presets.java:1599 msgid "Chalet" -msgstr "Chalet" +msgstr "Cabaña o bungalow" #. item "Travel/Accomodation/Chalet" @@ -19193,5 +19178,5 @@ #: build/trans_presets.java:1601 msgid "Edit Chalet" -msgstr "Editar chalet" +msgstr "Editar cabaña o bungalow" #. item "Travel/Accomodation/Chalet" text "Name" @@ -19343,5 +19328,5 @@ #: build/trans_presets.java:1653 msgid "Pub" -msgstr "Bar" +msgstr "Pub" #. item "Food+Drinks/Pub" @@ -19349,5 +19334,5 @@ #: build/trans_presets.java:1655 msgid "Edit Pub" -msgstr "Editar bar" +msgstr "Editar pub" #: build/trans_presets.java:1660 @@ -19476,5 +19461,5 @@ #. 30000 #. -#. +#. #. #. @@ -19484,5 +19469,5 @@ #. 40000 #. -#. +#. #. #. @@ -19492,5 +19477,5 @@ #. 20000 #. -#. +#. #. #. @@ -19500,5 +19485,5 @@ #. 40000 #. -#. +#. #. #. @@ -19714,5 +19699,5 @@ #: build/trans_presets.java:1841 msgid "Palaeontological Site" -msgstr "Sitio Paleontológico" +msgstr "Sitio paleontológico" #. item "Historic Places/Palaeontological Site" @@ -19720,5 +19705,5 @@ #: build/trans_presets.java:1843 msgid "Edit Palaeontological Site" -msgstr "Editar Sitio Paleontológico" +msgstr "Editar sitio paleontológico" #. item "Historic Places/Palaeontological Site" text "Name" @@ -19856,7 +19841,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19866,5 +19851,5 @@ #. 50000 #. -#. +#. #. #. @@ -19874,5 +19859,5 @@ #. 50000 #. -#. +#. #. #. @@ -19882,5 +19867,5 @@ #. 50000 #. -#. +#. #. #. @@ -19890,5 +19875,5 @@ #. 50000 #. -#. +#. #. #. @@ -19898,5 +19883,5 @@ #. 50000 #. -#. +#. #. #. @@ -19906,5 +19891,5 @@ #. 50000 #. -#. +#. #. #. @@ -19914,5 +19899,5 @@ #. 50000 #. -#. +#. #. #. @@ -19922,5 +19907,5 @@ #. 50000 #. -#. +#. #. #. @@ -19930,5 +19915,5 @@ #. 50000 #. -#. +#. #. #. @@ -19938,5 +19923,5 @@ #. 50000 #. -#. +#. #. #. @@ -19946,5 +19931,5 @@ #. 50000 #. -#. +#. #. #. @@ -19954,5 +19939,5 @@ #. 50000 #. -#. +#. #. #. @@ -19962,5 +19947,5 @@ #. 50000 #. -#. +#. #. #. @@ -19970,5 +19955,5 @@ #. 50000 #. -#. +#. #. #. @@ -19978,5 +19963,5 @@ #. 50000 #. -#. +#. #. #. @@ -19986,5 +19971,5 @@ #. 50000 #. -#. +#. #. #. @@ -19994,5 +19979,5 @@ #. 50000 #. -#. +#. #. #. @@ -20002,5 +19987,5 @@ #. 50000 #. -#. +#. #. #. @@ -20010,5 +19995,5 @@ #. 50000 #. -#. +#. #. #. @@ -20018,5 +20003,5 @@ #. 50000 #. -#. +#. #. #. @@ -20026,5 +20011,5 @@ #. 50000 #. -#. +#. #. #. @@ -20034,5 +20019,5 @@ #. 50000 #. -#. +#. #. #. @@ -20042,5 +20027,5 @@ #. 50000 #. -#. +#. #. #. @@ -20050,5 +20035,5 @@ #. 50000 #. -#. +#. #. #. @@ -20058,5 +20043,5 @@ #. 50000 #. -#. +#. #. #. @@ -20066,5 +20051,5 @@ #. 50000 #. -#. +#. #. #. @@ -20074,5 +20059,5 @@ #. 50000 #. -#. +#. #. #. @@ -20082,5 +20067,5 @@ #. 50000 #. -#. +#. #. #. @@ -20090,5 +20075,5 @@ #. 50000 #. -#. +#. #. #. @@ -20098,5 +20083,5 @@ #. 50000 #. -#. +#. #. #. @@ -20106,5 +20091,5 @@ #. 50000 #. -#. +#. #. #. @@ -20114,5 +20099,5 @@ #. 50000 #. -#. +#. #. #. @@ -20122,5 +20107,5 @@ #. 50000 #. -#. +#. #. #. @@ -20130,5 +20115,5 @@ #. 50000 #. -#. +#. #. #. @@ -20138,5 +20123,5 @@ #. 50000 #. -#. +#. #. #. @@ -20146,5 +20131,5 @@ #. 50000 #. -#. +#. #. #. @@ -20154,5 +20139,5 @@ #. 50000 #. -#. +#. #. #. @@ -20162,5 +20147,5 @@ #. 50000 #. -#. +#. #. #. @@ -20170,5 +20155,5 @@ #. 50000 #. -#. +#. #. #. @@ -20178,5 +20163,5 @@ #. 50000 #. -#. +#. #. #. @@ -20186,5 +20171,5 @@ #. 50000 #. -#. +#. #. #. @@ -20194,5 +20179,5 @@ #. 50000 #. -#. +#. #. #. @@ -20202,5 +20187,5 @@ #. 50000 #. -#. +#. #. #. @@ -20210,5 +20195,5 @@ #. 50000 #. -#. +#. #. #. @@ -20218,5 +20203,5 @@ #. 50000 #. -#. +#. #. #. @@ -20226,5 +20211,5 @@ #. 50000 #. -#. +#. #. #. @@ -21703,5 +21688,5 @@ #: build/trans_presets.java:2416 msgid "pole" -msgstr "polo" +msgstr "poste" #: build/trans_presets.java:2417 @@ -21918,7 +21903,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21928,5 +21913,5 @@ #. 50000 #. -#. +#. #. #. @@ -21936,5 +21921,5 @@ #. 50000 #. -#. +#. #. #. @@ -21944,5 +21929,5 @@ #. 50000 #. -#. +#. #. #. @@ -21952,5 +21937,5 @@ #. 50000 #. -#. +#. #. #. @@ -21960,5 +21945,5 @@ #. 50000 #. -#. +#. #. #. @@ -21968,5 +21953,5 @@ #. 50000 #. -#. +#. #. #. @@ -21976,5 +21961,5 @@ #. 50000 #. -#. +#. #. #. @@ -23312,5 +23297,5 @@ #. 40000 #. -#. +#. #. #. @@ -23326,5 +23311,5 @@ #. 30000 #. -#. +#. #. #. @@ -23335,7 +23320,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23345,5 +23330,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -23353,13 +23346,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -23369,5 +23354,5 @@ #. 50000 #. -#. +#. #. #. @@ -23400,5 +23385,5 @@ #. 50000 #. -#. +#. #. #. @@ -23414,5 +23399,5 @@ #. 50000 #. -#. +#. #. #. @@ -23422,5 +23407,5 @@ #. 10000 #. -#. +#. #. #. @@ -23430,5 +23415,5 @@ #. 10000 #. -#. +#. #. #. @@ -23439,5 +23424,5 @@ #. 10000 #. -#. +#. #. #. @@ -23466,5 +23451,5 @@ #. 50000 #. -#. +#. #. #. @@ -23579,9 +23564,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 @@ -23589,5 +23574,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, @@ -23597,8 +23582,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 @@ -23612,5 +23597,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23618,5 +23603,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23665,6 +23650,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23744,5 +23729,5 @@ #. 40000 #. -#. +#. #. #. @@ -23752,5 +23737,5 @@ #. 10000 #. -#. +#. #. #. @@ -23759,5 +23744,5 @@ #. 50000 #. -#. +#. #. #. @@ -23767,5 +23752,5 @@ #. 50000 #. -#. +#. #. #. @@ -23774,5 +23759,5 @@ #. 50000 #. -#. +#. #. #. @@ -23781,5 +23766,5 @@ #. 50000 #. -#. +#. #. #. @@ -23788,5 +23773,5 @@ #. 50000 #. -#. +#. #. #. @@ -23795,5 +23780,5 @@ #. 50000 #. -#. +#. #. #. @@ -23802,5 +23787,5 @@ #. 40000 #. -#. +#. #. #. @@ -23809,5 +23794,5 @@ #. 50000 #. -#. +#. #. #. @@ -23816,5 +23801,5 @@ #. 50000 #. -#. +#. #. #. @@ -23823,5 +23808,5 @@ #. 50000 #. -#. +#. #. #. @@ -23830,5 +23815,5 @@ #. 50000 #. -#. +#. #. #. @@ -23837,5 +23822,5 @@ #. 50000 #. -#. +#. #. #. @@ -23844,5 +23829,5 @@ #. 50000 #. -#. +#. #. #. @@ -23852,5 +23837,5 @@ #. 50000 #. -#. +#. #. #. @@ -23859,5 +23844,5 @@ #. 50000 #. -#. +#. #. #. @@ -23868,5 +23853,5 @@ #. 50000 #. -#. +#. #. #. @@ -23878,11 +23863,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23891,7 +23876,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23902,5 +23887,5 @@ #. 50000 #. -#. +#. #. #. @@ -23911,5 +23896,5 @@ #. 50000 #. -#. +#. #. #. @@ -23920,5 +23905,5 @@ #. 50000 #. -#. +#. #. #. @@ -23929,5 +23914,5 @@ #. 50000 #. -#. +#. #. #. @@ -23938,5 +23923,5 @@ #. 50000 #. -#. +#. #. #. @@ -23947,5 +23932,5 @@ #. 40000 #. -#. +#. #. #. @@ -23957,5 +23942,5 @@ #. 50000 #. -#. +#. #. #. @@ -23966,5 +23951,5 @@ #. 50000 #. -#. +#. #. #. @@ -23989,5 +23974,5 @@ #. 10000 #. -#. +#. #. #. @@ -23996,5 +23981,5 @@ #. 50000 #. -#. +#. #. #. @@ -24003,5 +23988,5 @@ #. 50000 #. -#. +#. #. #. @@ -24017,5 +24002,5 @@ #. 20000 #. -#. +#. #. #. @@ -24029,5 +24014,5 @@ #. 30000 #. -#. +#. #. #. @@ -24036,5 +24021,5 @@ #. 50000 #. -#. +#. #. #. @@ -24043,5 +24028,5 @@ #. 50000 #. -#. +#. #. #. @@ -24050,5 +24035,5 @@ #. 50000 #. -#. +#. #. #. @@ -24057,5 +24042,5 @@ #. 50000 #. -#. +#. #. #. @@ -24064,5 +24049,5 @@ #. 50000 #. -#. +#. #. #. @@ -24071,5 +24056,5 @@ #. 50000 #. -#. +#. #. #. @@ -24078,5 +24063,5 @@ #. 50000 #. -#. +#. #. #. @@ -24085,5 +24070,5 @@ #. 50000 #. -#. +#. #. #. @@ -24092,5 +24077,5 @@ #. 50000 #. -#. +#. #. #. @@ -24099,5 +24084,5 @@ #. 50000 #. -#. +#. #. #. @@ -24106,5 +24091,5 @@ #. 50000 #. -#. +#. #. #. @@ -24113,5 +24098,5 @@ #. 50000 #. -#. +#. #. #. @@ -24120,5 +24105,5 @@ #. 50000 #. -#. +#. #. #. @@ -24127,5 +24112,5 @@ #. 50000 #. -#. +#. #. #. @@ -24296,7 +24281,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24310,5 +24295,5 @@ #. 40000 #. -#. +#. #. #. @@ -24318,7 +24303,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24328,5 +24313,5 @@ #. 50000 #. -#. +#. #. #. @@ -24336,5 +24321,5 @@ #. 50000 #. -#. +#. #. #. @@ -24344,5 +24329,5 @@ #. 50000 #. -#. +#. #. #. @@ -24352,5 +24337,5 @@ #. 50000 #. -#. +#. #. #. @@ -24366,5 +24351,5 @@ #. 10000 #. -#. +#. #. #. @@ -24374,5 +24359,5 @@ #. 50000 #. -#. +#. #. #. @@ -24382,5 +24367,5 @@ #. 50000 #. -#. +#. #. #. @@ -24390,5 +24375,5 @@ #. 50000 #. -#. +#. #. #. @@ -24398,5 +24383,5 @@ #. 50000 #. -#. +#. #. #. @@ -24406,5 +24391,5 @@ #. 50000 #. -#. +#. #. #. @@ -24414,5 +24399,5 @@ #. 50000 #. -#. +#. #. #. @@ -24431,5 +24416,5 @@ #. 50000 #. -#. +#. #. #. @@ -24438,5 +24423,5 @@ #. 50000 #. -#. +#. #. #. @@ -24450,5 +24435,5 @@ #. 50000 #. -#. +#. #. #. @@ -24462,5 +24447,5 @@ #. 50000 #. -#. +#. #. #. @@ -24469,5 +24454,5 @@ #. 50000 #. -#. +#. #. #. @@ -24481,5 +24466,5 @@ #. 50000 #. -#. +#. #. #. @@ -24494,5 +24479,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24507,5 +24492,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24519,5 +24504,5 @@ #. 50000 #. -#. +#. #. #. @@ -24531,5 +24516,5 @@ #. 50000 #. -#. +#. #. #. @@ -24538,5 +24523,5 @@ #. 50000 #. -#. +#. #. #. @@ -24545,5 +24530,5 @@ #. 50000 #. -#. +#. #. #. @@ -24557,5 +24542,5 @@ #. 50000 #. -#. +#. #. #. @@ -24565,5 +24550,5 @@ #. 50000 #. -#. +#. #. #. @@ -24572,5 +24557,5 @@ #. 50000 #. -#. +#. #. #. @@ -24579,5 +24564,5 @@ #. 50000 #. -#. +#. #. #. @@ -24586,5 +24571,5 @@ #. 50000 #. -#. +#. #. #. @@ -24594,5 +24579,5 @@ #. 50000 #. -#. +#. #. #. @@ -24603,5 +24588,5 @@ #. 50000 #. -#. +#. #. #. @@ -24611,7 +24596,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24621,5 +24606,5 @@ #. 50000 #. -#. +#. #. #. @@ -24629,5 +24614,5 @@ #. 50000 #. -#. +#. #. #. @@ -24637,5 +24622,5 @@ #. 50000 #. -#. +#. #. #. @@ -24646,5 +24631,5 @@ #. 50000 #. -#. +#. #. #. @@ -24654,5 +24639,5 @@ #. 50000 #. -#. +#. #. #. @@ -24662,5 +24647,5 @@ #. 50000 #. -#. +#. #. #. @@ -24670,5 +24655,5 @@ #. 50000 #. -#. +#. #. #. @@ -24678,5 +24663,5 @@ #. 50000 #. -#. +#. #. #. @@ -24686,5 +24671,5 @@ #. 50000 #. -#. +#. #. #. @@ -24694,5 +24679,5 @@ #. 50000 #. -#. +#. #. #. @@ -24702,5 +24687,5 @@ #. 50000 #. -#. +#. #. #. @@ -24710,5 +24695,5 @@ #. 50000 #. -#. +#. #. #. @@ -24731,7 +24716,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24741,5 +24726,5 @@ #. 50000 #. -#. +#. #. #. @@ -24748,5 +24733,5 @@ #. 50000 #. -#. +#. #. #. @@ -24756,5 +24741,5 @@ #. 50000 #. -#. +#. #. #. @@ -24763,5 +24748,5 @@ #. 50000 #. -#. +#. #. #. @@ -24771,5 +24756,5 @@ #. 50000 #. -#. +#. #. #. @@ -24779,5 +24764,5 @@ #. 50000 #. -#. +#. #. #. @@ -24793,5 +24778,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24802,5 +24787,5 @@ #. 50000 #. -#. +#. #. #. @@ -24819,5 +24804,5 @@ #. 50000 #. -#. +#. #. #. @@ -24827,5 +24812,5 @@ #. 50000 #. -#. +#. #. #. @@ -24838,5 +24823,5 @@ #. 50000 #. -#. +#. #. #. @@ -24854,5 +24839,5 @@ #. 50000 #. -#. +#. #. #. @@ -24861,5 +24846,5 @@ #. 50000 #. -#. +#. #. #. @@ -24868,5 +24853,5 @@ #. 50000 #. -#. +#. #. #. @@ -24875,7 +24860,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24886,5 +24871,5 @@ #. 50000 #. -#. +#. #. #. @@ -24899,5 +24884,5 @@ #. 50000 #. -#. +#. #. #. @@ -24911,5 +24896,5 @@ #. 50000 #. -#. +#. #. #. @@ -24919,5 +24904,5 @@ #. 50000 #. -#. +#. #. #. @@ -24931,5 +24916,5 @@ #. 50000 #. -#. +#. #. #. @@ -24943,5 +24928,5 @@ #. 50000 #. -#. +#. #. #. @@ -24950,7 +24935,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24960,5 +24945,5 @@ #. 50000 #. -#. +#. #. #. @@ -24968,5 +24953,5 @@ #. 50000 #. -#. +#. #. #. @@ -24976,5 +24961,5 @@ #. 50000 #. -#. +#. #. #. @@ -24984,5 +24969,5 @@ #. 50000 #. -#. +#. #. #. @@ -24998,7 +24983,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25013,5 +24998,5 @@ #. 30000 #. -#. +#. #. #. @@ -25026,5 +25011,5 @@ #. 30000 #. -#. +#. #. #. @@ -25039,5 +25024,5 @@ #. 30000 #. -#. +#. #. #. @@ -25052,5 +25037,5 @@ #. 30000 #. -#. +#. #. #. @@ -25065,5 +25050,5 @@ #. 30000 #. -#. +#. #. #. @@ -25078,7 +25063,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -25088,5 +25073,5 @@ #. 50000 #. -#. +#. #. #. @@ -25095,5 +25080,5 @@ #. 50000 #. -#. +#. #. #. @@ -25103,5 +25088,5 @@ #. 50000 #. -#. +#. #. #. @@ -25111,5 +25096,5 @@ #. 50000 #. -#. +#. #. #. @@ -25119,5 +25104,5 @@ #. 50000 #. -#. +#. #. #. @@ -25127,5 +25112,5 @@ #. 50000 #. -#. +#. #. #. @@ -25135,5 +25120,5 @@ #. 50000 #. -#. +#. #. #. @@ -25143,5 +25128,5 @@ #. 50000 #. -#. +#. #. #. @@ -25151,5 +25136,5 @@ #. 50000 #. -#. +#. #. #. @@ -25159,5 +25144,5 @@ #. 50000 #. -#. +#. #. #. @@ -25167,5 +25152,5 @@ #. 50000 #. -#. +#. #. #. @@ -25175,5 +25160,5 @@ #. 50000 #. -#. +#. #. #. @@ -25183,5 +25168,5 @@ #. 50000 #. -#. +#. #. #. @@ -25201,5 +25186,5 @@ #. 50000 #. -#. +#. #. #. @@ -25214,5 +25199,5 @@ #. 50000 #. -#. +#. #. #. @@ -25225,7 +25210,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25235,5 +25220,5 @@ #. 50000 #. -#. +#. #. #. @@ -25243,5 +25228,5 @@ #. 50000 #. -#. +#. #. #. @@ -25251,5 +25236,5 @@ #. 50000 #. -#. +#. #. #. @@ -25259,5 +25244,5 @@ #. 50000 #. -#. +#. #. #. @@ -25267,5 +25252,5 @@ #. 50000 #. -#. +#. #. #. @@ -25275,5 +25260,5 @@ #. 50000 #. -#. +#. #. #. @@ -25283,5 +25268,5 @@ #. 50000 #. -#. +#. #. #. @@ -25291,5 +25276,5 @@ #. 50000 #. -#. +#. #. #. @@ -25299,5 +25284,5 @@ #. 50000 #. -#. +#. #. #. @@ -25307,5 +25292,5 @@ #. 50000 #. -#. +#. #. #. @@ -25315,5 +25300,5 @@ #. 50000 #. -#. +#. #. #. @@ -25323,5 +25308,5 @@ #. 50000 #. -#. +#. #. #. @@ -25331,5 +25316,5 @@ #. 50000 #. -#. +#. #. #. @@ -25339,5 +25324,5 @@ #. 50000 #. -#. +#. #. #. @@ -25358,5 +25343,5 @@ #. 50000 #. -#. +#. #. #. @@ -25370,7 +25355,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25380,5 +25365,5 @@ #. 50000 #. -#. +#. #. #. @@ -25388,5 +25373,5 @@ #. 50000 #. -#. +#. #. #. @@ -25396,5 +25381,5 @@ #. 50000 #. -#. +#. #. #. @@ -25404,5 +25389,5 @@ #. 50000 #. -#. +#. #. #. @@ -25412,5 +25397,5 @@ #. 50000 #. -#. +#. #. #. @@ -25420,5 +25405,5 @@ #. 50000 #. -#. +#. #. #. @@ -25428,5 +25413,5 @@ #. 50000 #. -#. +#. #. #. @@ -25443,5 +25428,5 @@ #. 50000 #. -#. +#. #. #. @@ -25451,5 +25436,5 @@ #. 50000 #. -#. +#. #. #. @@ -25459,5 +25444,5 @@ #. 50000 #. -#. +#. #. #. @@ -25467,5 +25452,5 @@ #. 50000 #. -#. +#. #. #. @@ -25475,5 +25460,5 @@ #. 50000 #. -#. +#. #. #. @@ -25483,5 +25468,5 @@ #. 50000 #. -#. +#. #. #. @@ -25491,5 +25476,5 @@ #. 50000 #. -#. +#. #. #. @@ -25499,5 +25484,5 @@ #. 50000 #. -#. +#. #. #. @@ -25507,5 +25492,5 @@ #. 50000 #. -#. +#. #. #. @@ -25515,5 +25500,5 @@ #. 50000 #. -#. +#. #. #. @@ -25523,5 +25508,5 @@ #. 50000 #. -#. +#. #. #. @@ -25531,5 +25516,5 @@ #. 50000 #. -#. +#. #. #. @@ -25548,5 +25533,5 @@ #. 50000 #. -#. +#. #. #. @@ -25556,5 +25541,5 @@ #. 50000 #. -#. +#. #. #. @@ -25563,5 +25548,5 @@ #. 50000 #. -#. +#. #. #. @@ -25571,5 +25556,5 @@ #. 50000 #. -#. +#. #. #. @@ -25579,5 +25564,5 @@ #. 50000 #. -#. +#. #. #. @@ -25587,5 +25572,5 @@ #. 50000 #. -#. +#. #. #. @@ -25594,5 +25579,5 @@ #. 50000 #. -#. +#. #. #. @@ -25602,5 +25587,5 @@ #. 50000 #. -#. +#. #. #. @@ -25610,5 +25595,5 @@ #. 50000 #. -#. +#. #. #. @@ -25618,5 +25603,5 @@ #. 50000 #. -#. +#. #. #. @@ -25626,5 +25611,5 @@ #. 50000 #. -#. +#. #. #. @@ -25633,5 +25618,5 @@ #. 50000 #. -#. +#. #. #. @@ -25640,5 +25625,5 @@ #. 50000 #. -#. +#. #. #. @@ -25647,5 +25632,5 @@ #. 50000 #. -#. +#. #. #. @@ -25654,5 +25639,5 @@ #. 50000 #. -#. +#. #. #. @@ -25661,5 +25646,5 @@ #. 50000 #. -#. +#. #. #. @@ -25668,5 +25653,5 @@ #. 50000 #. -#. +#. #. #. @@ -25675,5 +25660,5 @@ #. 50000 #. -#. +#. #. #. @@ -25682,5 +25667,5 @@ #. 50000 #. -#. +#. #. #. @@ -25689,5 +25674,5 @@ #. 50000 #. -#. +#. #. #. @@ -25696,5 +25681,5 @@ #. 50000 #. -#. +#. #. #. @@ -25703,5 +25688,5 @@ #. 50000 #. -#. +#. #. #. @@ -25710,5 +25695,5 @@ #. 50000 #. -#. +#. #. #. @@ -25717,5 +25702,5 @@ #. 50000 #. -#. +#. #. #. @@ -25725,5 +25710,5 @@ #. 50000 #. -#. +#. #. #. @@ -25733,5 +25718,5 @@ #. 50000 #. -#. +#. #. #. @@ -25741,5 +25726,5 @@ #. 50000 #. -#. +#. #. #. @@ -25749,5 +25734,5 @@ #. 50000 #. -#. +#. #. #. @@ -25757,5 +25742,5 @@ #. 50000 #. -#. +#. #. #. @@ -25765,5 +25750,5 @@ #. 50000 #. -#. +#. #. #. @@ -25773,5 +25758,5 @@ #. 50000 #. -#. +#. #. #. @@ -25781,5 +25766,5 @@ #. 50000 #. -#. +#. #. #. @@ -25789,5 +25774,5 @@ #. 50000 #. -#. +#. #. #. @@ -25798,5 +25783,5 @@ #. 50000 #. -#. +#. #. #. @@ -25806,5 +25791,5 @@ #. 50000 #. -#. +#. #. #. @@ -25814,5 +25799,5 @@ #. 50000 #. -#. +#. #. #. @@ -25822,5 +25807,5 @@ #. 50000 #. -#. +#. #. #. @@ -25830,5 +25815,5 @@ #. 50000 #. -#. +#. #. #. @@ -25838,5 +25823,5 @@ #. 50000 #. -#. +#. #. #. @@ -25846,5 +25831,5 @@ #. 50000 #. -#. +#. #. #. @@ -25854,5 +25839,5 @@ #. 50000 #. -#. +#. #. #. @@ -25862,5 +25847,5 @@ #. 50000 #. -#. +#. #. #. @@ -25870,5 +25855,5 @@ #. 50000 #. -#. +#. #. #. @@ -25878,5 +25863,5 @@ #. 50000 #. -#. +#. #. #. @@ -25886,5 +25871,5 @@ #. 50000 #. -#. +#. #. #. @@ -25894,5 +25879,5 @@ #. 50000 #. -#. +#. #. #. @@ -25902,5 +25887,5 @@ #. 50000 #. -#. +#. #. #. @@ -25910,5 +25895,5 @@ #. 50000 #. -#. +#. #. #. @@ -25918,5 +25903,5 @@ #. 50000 #. -#. +#. #. #. @@ -25926,5 +25911,5 @@ #. 50000 #. -#. +#. #. #. @@ -25934,5 +25919,5 @@ #. 50000 #. -#. +#. #. #. @@ -25942,5 +25927,5 @@ #. 50000 #. -#. +#. #. #. @@ -25949,5 +25934,5 @@ #. 50000 #. -#. +#. #. #. @@ -25979,5 +25964,5 @@ #. 50000 #. -#. +#. #. #. @@ -25987,5 +25972,5 @@ #. 50000 #. -#. +#. #. #. @@ -25995,7 +25980,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26010,5 +25995,5 @@ #. 50000 #. -#. +#. #. #. @@ -26018,5 +26003,5 @@ #. 50000 #. -#. +#. #. #. @@ -26026,5 +26011,5 @@ #. 50000 #. -#. +#. #. #. @@ -26034,5 +26019,5 @@ #. 50000 #. -#. +#. #. #. @@ -26042,5 +26027,5 @@ #. 50000 #. -#. +#. #. #. @@ -26050,5 +26035,5 @@ #. 50000 #. -#. +#. #. #. @@ -26058,5 +26043,5 @@ #. 50000 #. -#. +#. #. #. @@ -26072,7 +26057,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -26082,5 +26067,5 @@ #. 50000 #. -#. +#. #. #. @@ -26090,5 +26075,5 @@ #. 50000 #. -#. +#. #. #. @@ -26098,5 +26083,5 @@ #. 50000 #. -#. +#. #. #. @@ -26106,5 +26091,5 @@ #. 50000 #. -#. +#. #. #. @@ -26114,5 +26099,5 @@ #. 50000 #. -#. +#. #. #. @@ -26122,5 +26107,5 @@ #. 50000 #. -#. +#. #. #. @@ -26130,5 +26115,5 @@ #. 50000 #. -#. +#. #. #. @@ -26138,5 +26123,5 @@ #. 50000 #. -#. +#. #. #. @@ -26146,5 +26131,5 @@ #. 50000 #. -#. +#. #. #. @@ -26154,5 +26139,5 @@ #. 50000 #. -#. +#. #. #. @@ -26162,5 +26147,5 @@ #. 50000 #. -#. +#. #. #. @@ -26170,5 +26155,5 @@ #. 50000 #. -#. +#. #. #. @@ -26178,5 +26163,5 @@ #. 50000 #. -#. +#. #. #. @@ -26186,5 +26171,5 @@ #. 50000 #. -#. +#. #. #. @@ -26194,5 +26179,5 @@ #. 50000 #. -#. +#. #. #. @@ -26202,5 +26187,5 @@ #. 50000 #. -#. +#. #. #. @@ -26210,5 +26195,5 @@ #. 50000 #. -#. +#. #. #. @@ -26218,5 +26203,5 @@ #. 50000 #. -#. +#. #. #. @@ -26226,5 +26211,5 @@ #. 50000 #. -#. +#. #. #. @@ -26234,5 +26219,5 @@ #. 50000 #. -#. +#. #. #. @@ -26242,5 +26227,5 @@ #. 50000 #. -#. +#. #. #. @@ -26250,5 +26235,5 @@ #. 50000 #. -#. +#. #. #. @@ -26258,5 +26243,5 @@ #. 50000 #. -#. +#. #. #. @@ -26266,5 +26251,5 @@ #. 50000 #. -#. +#. #. #. @@ -26274,5 +26259,5 @@ #. 50000 #. -#. +#. #. #. @@ -26282,5 +26267,5 @@ #. 50000 #. -#. +#. #. #. @@ -26290,5 +26275,5 @@ #. 50000 #. -#. +#. #. #. @@ -26298,5 +26283,5 @@ #. 50000 #. -#. +#. #. #. @@ -26306,5 +26291,5 @@ #. 50000 #. -#. +#. #. #. @@ -26314,5 +26299,5 @@ #. 50000 #. -#. +#. #. #. @@ -26322,5 +26307,5 @@ #. 50000 #. -#. +#. #. #. @@ -26330,5 +26315,5 @@ #. 50000 #. -#. +#. #. #. @@ -26338,5 +26323,5 @@ #. 50000 #. -#. +#. #. #. @@ -26346,5 +26331,5 @@ #. 50000 #. -#. +#. #. #. @@ -26354,5 +26339,5 @@ #. 50000 #. -#. +#. #. #. @@ -26362,5 +26347,5 @@ #. 50000 #. -#. +#. #. #. @@ -26370,5 +26355,5 @@ #. 50000 #. -#. +#. #. #. @@ -26378,5 +26363,5 @@ #. 50000 #. -#. +#. #. #. @@ -26386,5 +26371,5 @@ #. 50000 #. -#. +#. #. #. @@ -26394,5 +26379,5 @@ #. 50000 #. -#. +#. #. #. @@ -26402,5 +26387,5 @@ #. 50000 #. -#. +#. #. #. @@ -26410,5 +26395,5 @@ #. 50000 #. -#. +#. #. #. @@ -26444,7 +26429,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26454,5 +26439,5 @@ #. 50000 #. -#. +#. #. #. @@ -26462,5 +26447,5 @@ #. 50000 #. -#. +#. #. #. @@ -26470,5 +26455,5 @@ #. 50000 #. -#. +#. #. #. @@ -26478,5 +26463,5 @@ #. 50000 #. -#. +#. #. #. @@ -26486,5 +26471,5 @@ #. 50000 #. -#. +#. #. #. @@ -26494,5 +26479,5 @@ #. 50000 #. -#. +#. #. #. @@ -26502,5 +26487,5 @@ #. 50000 #. -#. +#. #. #. @@ -26517,5 +26502,5 @@ #. 50000 #. -#. +#. #. #. @@ -26525,5 +26510,5 @@ #. 50000 #. -#. +#. #. #. @@ -26533,5 +26518,5 @@ #. 50000 #. -#. +#. #. #. @@ -26541,5 +26526,5 @@ #. 50000 #. -#. +#. #. #. @@ -26549,5 +26534,5 @@ #. 50000 #. -#. +#. #. #. @@ -26557,5 +26542,5 @@ #. 50000 #. -#. +#. #. #. @@ -26566,5 +26551,5 @@ #. 50000 #. -#. +#. #. #. @@ -26574,5 +26559,5 @@ #. 50000 #. -#. +#. #. #. @@ -26582,5 +26567,5 @@ #. 40000 #. -#. +#. #. #. @@ -26590,5 +26575,5 @@ #. 50000 #. -#. +#. #. #. @@ -26597,5 +26582,5 @@ #. 40000 #. -#. +#. #. #. @@ -26604,5 +26589,5 @@ #. 40000 #. -#. +#. #. #. @@ -26620,7 +26605,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26630,5 +26615,5 @@ #. 50000 #. -#. +#. #. #. @@ -26638,5 +26623,5 @@ #. 50000 #. -#. +#. #. #. @@ -26646,5 +26631,5 @@ #. 50000 #. -#. +#. #. #. @@ -26654,5 +26639,5 @@ #. 50000 #. -#. +#. #. #. @@ -26662,5 +26647,5 @@ #. 50000 #. -#. +#. #. #. @@ -26670,5 +26655,5 @@ #. 50000 #. -#. +#. #. #. @@ -26678,5 +26663,5 @@ #. 50000 #. -#. +#. #. #. @@ -26686,5 +26671,5 @@ #. 50000 #. -#. +#. #. #. @@ -26694,5 +26679,5 @@ #. 50000 #. -#. +#. #. #. @@ -26711,5 +26696,5 @@ #. 50000 #. -#. +#. #. #. @@ -26723,5 +26708,5 @@ #. 50000 #. -#. +#. #. #. @@ -26735,5 +26720,5 @@ #. 50000 #. -#. +#. #. #. @@ -26743,5 +26728,5 @@ #. 50000 #. -#. +#. #. #. @@ -26755,5 +26740,5 @@ #. 50000 #. -#. +#. #. #. @@ -26767,5 +26752,5 @@ #. 50000 #. -#. +#. #. #. @@ -26779,6 +26764,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26788,5 +26773,5 @@ #. 50000 #. -#. +#. #. #. @@ -26800,5 +26785,5 @@ #. 50000 #. -#. +#. #. #. @@ -26812,5 +26797,5 @@ #. 50000 #. -#. +#. #. #. @@ -26824,5 +26809,5 @@ #. 50000 #. -#. +#. #. #. @@ -26836,5 +26821,5 @@ #. 50000 #. -#. +#. #. #. @@ -26848,5 +26833,5 @@ #. 50000 #. -#. +#. #. #. @@ -26856,7 +26841,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26866,5 +26851,5 @@ #. 50000 #. -#. +#. #. #. @@ -26874,5 +26859,5 @@ #. 50000 #. -#. +#. #. #. @@ -26882,5 +26867,5 @@ #. 50000 #. -#. +#. #. #. @@ -26890,5 +26875,5 @@ #. 50000 #. -#. +#. #. #. @@ -26905,5 +26890,5 @@ #. 50000 #. -#. +#. #. #. @@ -26916,5 +26901,5 @@ #. 50000 #. -#. +#. #. #. @@ -26928,5 +26913,5 @@ #. 50000 #. -#. +#. #. #. @@ -26940,5 +26925,5 @@ #. 50000 #. -#. +#. #. #. @@ -26952,5 +26937,5 @@ #. 50000 #. -#. +#. #. #. @@ -26961,5 +26946,5 @@ #. 50000 #. -#. +#. #. #. @@ -26969,5 +26954,5 @@ #. 50000 #. -#. +#. #. #. @@ -26977,5 +26962,5 @@ #. 50000 #. -#. +#. #. #. @@ -26985,5 +26970,5 @@ #. 50000 #. -#. +#. #. #. @@ -26993,5 +26978,5 @@ #. 50000 #. -#. +#. #. #. @@ -27008,5 +26993,5 @@ #. 50000 #. -#. +#. #. #. @@ -27020,5 +27005,5 @@ #. 50000 #. -#. +#. #. #. @@ -27032,5 +27017,5 @@ #. 50000 #. -#. +#. #. #. @@ -27044,5 +27029,5 @@ #. 50000 #. -#. +#. #. #. @@ -27056,5 +27041,5 @@ #. 50000 #. -#. +#. #. #. @@ -27068,5 +27053,5 @@ #. 50000 #. -#. +#. #. #. @@ -27075,7 +27060,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27085,5 +27070,5 @@ #. 50000 #. -#. +#. #. #. @@ -27093,5 +27078,5 @@ #. 50000 #. -#. +#. #. #. @@ -27101,5 +27086,5 @@ #. 50000 #. -#. +#. #. #. @@ -27109,5 +27094,5 @@ #. 50000 #. -#. +#. #. #. @@ -27117,5 +27102,5 @@ #. 50000 #. -#. +#. #. #. @@ -27125,5 +27110,5 @@ #. 50000 #. -#. +#. #. #. @@ -27133,5 +27118,5 @@ #. 50000 #. -#. +#. #. #. @@ -27148,7 +27133,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27158,5 +27143,5 @@ #. 50000 #. -#. +#. #. #. @@ -27166,5 +27151,5 @@ #. 50000 #. -#. +#. #. #. @@ -27174,5 +27159,5 @@ #. 50000 #. -#. +#. #. #. @@ -27182,5 +27167,5 @@ #. 50000 #. -#. +#. #. #. @@ -27196,5 +27181,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -27243,5 +27228,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27251,5 +27236,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27259,5 +27244,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27267,5 +27252,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27275,5 +27260,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27283,5 +27268,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27291,5 +27276,5 @@ #. 50000 #. -#. +#. #. #. @@ -27299,5 +27284,5 @@ #. 50000 #. -#. +#. #. #. @@ -27307,5 +27292,5 @@ #. 50000 #. -#. +#. #. #. @@ -27315,5 +27300,5 @@ #. 50000 #. -#. +#. #. #. @@ -27323,5 +27308,5 @@ #. 50000 #. -#. +#. #. #. @@ -27331,5 +27316,5 @@ #. 50000 #. -#. +#. #. #. @@ -27349,5 +27334,5 @@ #. 50000 #. -#. +#. #. #. @@ -27356,5 +27341,5 @@ #. 50000 #. -#. +#. #. #. @@ -27363,5 +27348,5 @@ #. 50000 #. -#. +#. #. #. @@ -27370,5 +27355,5 @@ #. 40000 #. -#. +#. #. #. @@ -27377,5 +27362,5 @@ #. 40000 #. -#. +#. #. #. @@ -27384,5 +27369,5 @@ #. 40000 #. -#. +#. #. #. @@ -27477,5 +27462,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -27483,28 +27468,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 @@ -27619,5 +27604,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27630,5 +27615,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27653,6 +27638,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27661,6 +27646,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27675,6 +27660,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 @@ -27688,6 +27673,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 @@ -27707,6 +27692,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27730,6 +27715,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 @@ -27742,4 +27727,103 @@ msgstr "" +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "No se puede deshacer la orden ''{0}'' porque la capa \"{1}'' ya no está " +#~ "presente" + +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Permitir subir todos los cambios en una petición, no permitir usar una " +#~ "petición por cambio sencillo" + +#~ msgid "Images for {0}" +#~ msgstr "Imágenes para {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Leer gpx" + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "No hay hora para el punto {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "No pudo leerse la hora \"{0}\" desde el punto {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "" +#~ "No se han encontrado imágenes con metadatos legibles sobre la fecha y " +#~ "hora." + +#~ msgid "GPS start: {0}" +#~ msgstr "Iniciar GPS: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "Finalizar GPS: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "delta actual: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "diferencia de zona horaria: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} dentro de la traza." + +#~ msgid "Sync clock" +#~ msgstr "Sincronizar reloj" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "" +#~ "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"." + +#~ msgid "Image" +#~ msgstr "Imagen" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Zona horaria del GPS (diferencia con la foto)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Sincronizar hora con la del receptor GPS" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "La hora no pudo ser analizada sintácticamente." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Fotos geoetiquetadas" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "abrir imágenes con AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "Opciones de osmarender" + +#~ msgid "Group common Address Interpolation inputs in a single dialog," +#~ msgstr "" +#~ "Agrupar las entradas comunes de \tinterpolación de direcciones en un " +#~ "único diálogo," + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Otro complemento de geoetiquetado para JOSM. Se relaciona las fotografías " +#~ "con la traza del GPS o importa los metadatos geográficos EXIF de las " +#~ "fotos." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Varias utilidades que hacen la vida en JOSM mucho más fácil: por ejemplo, " +#~ "simplificar un vía, unir áreas, moverse a un determinada posición, etc." + #~ msgid "Move" #~ msgstr "Mover" @@ -27766,5 +27850,4 @@ #~ msgstr "Existieron conflictos durante la importación" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "No se puede abrir el directorio de preferencias: {0}" @@ -27825,5 +27908,4 @@ #~ msgstr "Por favor, seleccione al menos una tarea para descargar" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Error mientras se cargaba la página {0}" @@ -27839,5 +27921,4 @@ #~ "aviso
cambiando la opción de configuración 'pluginmanager.warntime'.)" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "El complemento requiere actualizar JOSM: {0}." @@ -27855,19 +27936,13 @@ #~ msgstr " no tiene ref" -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Por favor, introduzca las coordenadas deseadas primero." - #~ msgid "Select a bookmark first." #~ msgstr "Seleccione un marcador primero." -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Usar preferencia ''{0}'' del grupo ''{1}''" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Usar preferencia ''{0}''" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27875,24 +27950,18 @@ #~ msgstr[1] "los objetos {0} tienen conflictos" -#, java-format #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." #~ msgstr[0] "" -#~ "El complemento {0} se ha actualizado correctamente. Por favor reinicie JOSM" +#~ "El complemento {0} se ha actualizado correctamente. Por favor reinicie " +#~ "JOSM" #~ msgstr[1] "" #~ "Los complementos {0} se han actualizado correctamente. Por favor reinicie " #~ "JOSM" -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "No se ha podido bajar el complemento: {0} al {1}" -#, java-format #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "Resolver conflictos {0} en objetos {1}" - -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Borrar {1} {0}" #~ msgid "Conflicting relation" @@ -27954,5 +28023,4 @@ #~ msgstr "Error analizando la respuesta del servidor" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Por favor presente una \"ticket\" en {0}" @@ -27965,6 +28033,6 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" #~ "Revertir el estado de todos los objetos actualmente seleccionados a la " @@ -27977,8 +28045,4 @@ #~ msgstr "Añadir site-josm.xml o bien Páginas Wiki" -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Error al borrar el archivo del complemento: {0}" - #~ msgid "Plugin already exists" #~ msgstr "Ya existe el complemento." @@ -28006,9 +28070,9 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" -#~ "Error interno: no se pueden comprobar las condiciones para ninguna capa. Por " -#~ "favor comunique esto como fallo." +#~ "Error interno: no se pueden comprobar las condiciones para ninguna capa. " +#~ "Por favor comunique esto como fallo." #~ msgid "Only two nodes allowed" @@ -28019,9 +28083,11 @@ #~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "Por favor seleccione vías de ángulos casi rectos para ortogonalizar." +#~ msgstr "" +#~ "Por favor seleccione vías de ángulos casi rectos para ortogonalizar." #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "" -#~ "Puede usar el ratón o las teclas Ctrl+Flecha para hacer zoom y desplazamiento" +#~ "Puede usar el ratón o las teclas Ctrl+Flecha para hacer zoom y " +#~ "desplazamiento" #~ msgid "Tagging preset source" @@ -28068,8 +28134,9 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" -#~ "Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere combinarlas?" +#~ "Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere " +#~ "combinarlas?" #~ msgid "Copy Default" @@ -28113,5 +28180,4 @@ #~ msgstr "Validar" -#, java-format #~ msgid "requested: {0}" #~ msgstr "solicitado:{0}" @@ -28121,6 +28187,6 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" #~ "Intente actualizar a las últimas versiones de JOSM y de todos los " @@ -28135,10 +28201,11 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" -#~ "ATENCIÓN: La contraseña está almacenada en texto plano en el archivo " -#~ "de preferencias.
La clave será transferida en texto plano al servidor, " -#~ "codificada en la URL.
No usar una contraseña importante." +#~ "ATENCIÓN: La contraseña está almacenada en texto plano en el " +#~ "archivo de preferencias.
La clave será transferida en texto plano al " +#~ "servidor, codificada en la URL.
No usar una contraseña importante." #~ msgid "" @@ -28183,11 +28250,11 @@ #~ msgstr "Miembro vacío en la relación." -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" -#~ "El complemento {0} parece roto o no se ha podido bajar de forma automática." - -#, java-format +#~ "El complemento {0} parece roto o no se ha podido bajar de forma " +#~ "automática." + #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28206,5 +28273,4 @@ #~ msgstr "Subir a OSM..." -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -28213,18 +28279,15 @@ #~ "{0}" #~ msgstr "" -#~ "El archivo de complemento ya está disponible. ¿Quiere descargar la versión " -#~ "actual borrando el archivo existente?\n" +#~ "El archivo de complemento ya está disponible. ¿Quiere descargar la " +#~ "versión actual borrando el archivo existente?\n" #~ "\n" #~ "{0}" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Autores: {0}" -#, java-format #~ msgid "Layers: {0}" #~ msgstr "Capas: {0}" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Conflictos: {0}" @@ -28255,5 +28318,4 @@ #~ msgstr "viaducto" -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Obviando una vía porque incluye un nodo que no existe: {0}\n" @@ -28286,5 +28348,4 @@ #~ msgstr "Mueve hacia abajo" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Editor de relación: {0}" @@ -28293,5 +28354,4 @@ #~ msgstr "Mover hacia arriba" -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -28313,17 +28373,16 @@ #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." #~ msgstr "" -#~ "ESTO ES EXPERIMENTAL. Guarde su trabajo y verifíquelo antes de la subirlo al " -#~ "servidor." +#~ "ESTO ES EXPERIMENTAL. Guarde su trabajo y verifíquelo antes de la subirlo " +#~ "al servidor." #~ msgid "Replaces Selection with Users data" #~ msgstr "Remplazar selección con los datos de usuarios" -#, java-format #~ msgid "rectifier id={0}" #~ msgstr "rectificar id={0}" #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -28340,6 +28399,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example,replacing 73 with your image id: \n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28349,6 +28408,6 @@ #~ msgstr "" #~ "Puede añadir, editar y borrar entradas de servicios WMS en la pestaña " -#~ "Preferencias del componente WMSplugin. Una vez modificado estos cambios se " -#~ "mostrarán en el menú WMS.\n" +#~ "Preferencias del componente WMSplugin. Una vez modificado estos cambios " +#~ "se mostrarán en el menú WMS.\n" #~ "\n" #~ "También puede hacerlo manualmente en 'Preferencias avanzadas' usando el " @@ -28363,7 +28422,7 @@ #~ "format=image/jpeg \n" #~ "\n" -#~ "Para el restificador de mapas de Metacarta " -#~ "http://labs.metacarta.com/rectifier/ únicamente necesita introducir el " -#~ "identificador 'id' que este servicio le proporciona.\n" +#~ "Para el restificador de mapas de Metacarta http://labs.metacarta.com/" +#~ "rectifier/ únicamente necesita introducir el identificador 'id' que este " +#~ "servicio le proporciona.\n" #~ "Para agregar una imagen de un mapa rectificada mediante esta utilidad de " #~ "Metacarta sustituya en esta URL de ejemplo el número 73 por el id que " @@ -28372,13 +28431,15 @@ #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" #~ " \n" -#~ "Nota: Asegúrese que los derechos de autor de la imagen que vaya a utilizar " -#~ "se adecúan a la licencia de OSM. Si duda, por favor, no la utilice." +#~ "Nota: Asegúrese que los derechos de autor de la imagen que vaya a " +#~ "utilizar se adecúan a la licencia de OSM. Si duda, por favor, no la " +#~ "utilice." #~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You can " -#~ "adjust the sliders to manually match the photos." +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." #~ msgstr "" -#~ "Se ha producido un error al tratar de hacer coincidir las fotografías con la " -#~ "traza GPX. Puede ajustarlo regulándolo manualmente para hacer coincidirlos.\"" +#~ "Se ha producido un error al tratar de hacer coincidir las fotografías con " +#~ "la traza GPX. Puede ajustarlo regulándolo manualmente para hacer " +#~ "coincidirlos.\"" #~ msgid "sports" @@ -28406,5 +28467,4 @@ #~ msgstr "Se han producido los siguientes errores durante la descarga masiva:" -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "Cambia la proyección a {0} previamente." @@ -28438,6 +28498,6 @@ #~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to selected " -#~ "user, opens browser showing selected author profile page." +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." #~ msgstr "" #~ "Herramientas para trabajar con los autores/usuarios. Selecciona datos del " @@ -28459,10 +28519,10 @@ #~ msgid "" #~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to OSM " -#~ "eg. deleting uninteresting parts of track." +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." #~ msgstr "" -#~ "La principal característica del componente es la posibilidad de eliminar los " -#~ "puntos de una traza GPX. Se puede utilizar para preparar las trazas antes " -#~ "subirlas a OSM para, por ejemplo, suprimir partes de la traza poco " +#~ "La principal característica del componente es la posibilidad de eliminar " +#~ "los puntos de una traza GPX. Se puede utilizar para preparar las trazas " +#~ "antes subirlas a OSM para, por ejemplo, suprimir partes de la traza poco " #~ "interesantes." @@ -28476,9 +28536,7 @@ #~ msgstr "% de lon:" -#, java-format #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "Imagen con la ruta {0} no existe o no puede ser leida." -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28517,6 +28575,6 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" #~ "Los nodos seleccionados pertenecen a distintas relaciones. ¿Seguro que " @@ -28534,7 +28592,9 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" -#~ "No hay datos que actualizar. ¿Ha abierto o descargado ya una capa de datos?" +#~ "No hay datos que actualizar. ¿Ha abierto o descargado ya una capa de " +#~ "datos?" #~ msgid "Undeleting relation..." @@ -28550,9 +28610,8 @@ #~ msgstr "Falta la primitiva" -#, java-format #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\"" - -#, java-format +#~ msgstr "" +#~ "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\"" + #~ msgid "" #~ "Uploading failed because a primitive you tried " @@ -28561,6 +28620,6 @@ #~ msgstr "" #~ " Subida falladadebido a que ha intentado eliminar " -#~ "una primitiva
en el servidor la cual ya está eliminada.
El mensaje " -#~ "de error es:
{0} " +#~ "una primitiva
en el servidor la cual ya está eliminada.
El " +#~ "mensaje de error es:
{0} " #~ msgid "Conflict detected" @@ -28576,38 +28635,37 @@ #~ msgstr "Aplicar resolución parcial" -#, java-format #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Comprobando si falta el primitivo {0}..." -#, java-format #~ msgid "" -#~ "The OSM primitive with id {0} has been deleted
on " -#~ "the server by another mapper.

Click {1} to keep your " -#~ "primitive and ignore the deleted state.
Your primitive will be assigend a " -#~ "new id.
Click {2} to accept the state on the server and " -#~ "to delete your primitive.
Click {3} to cancel.
" +#~ "The OSM primitive with id {0} has been " +#~ "deleted
on the server by another mapper.

Click {1} to keep your primitive and ignore the deleted state.
Your " +#~ "primitive will be assigend a new id.
Click {2} to " +#~ "accept the state on the server and to delete your primitive.
Click " +#~ "{3} to cancel.
" #~ msgstr "" -#~ "El primitivo de OSM con ID {0} ha sido borrado
en " -#~ "el servidor por otro mapeador.

Pulse {1} para " -#~ "mantener su primitivo e ignorar el estado de borrado.
Se asignará una " -#~ "nueva ID a su primitivo.
Pulse {2} para aceptar el " -#~ "estado en el servidor y borrar su primitivo.
Pulse {3} " -#~ "para cancelar.
" - -#, java-format +#~ "El primitivo de OSM con ID {0} ha sido " +#~ "borrado
en el servidor por otro mapeador.

Pulse {1} para mantener su primitivo e ignorar el estado de borrado.
Se " +#~ "asignará una nueva ID a su primitivo.
Pulse {2} para " +#~ "aceptar el estado en el servidor y borrar su primitivo.
Pulse " +#~ "{3} para cancelar.
" + #~ msgid "Checking whether node {0} is gone ..." #~ msgstr "Comprobando si falta el nodo {0}..." -#, java-format #~ msgid "" -#~ "There are {0} primitives
selected for individual " -#~ "update. Please reduce the selection
to max. {1} primitives." +#~ "There are {0} primitives
selected for " +#~ "individual update. Please reduce the selection
to max. {1} primitives." +#~ "" #~ msgstr "" #~ "Hay {0} primitivos
seleccionados para " -#~ "actualización individual. Por favor, reduzca la selección
a un máximo de " -#~ "{1} primitivos." +#~ "actualización individual. Por favor, reduzca la selección
a un máximo " +#~ "de {1} primitivos." #~ msgid "Updates the currently selected primitives from the server" -#~ msgstr "Actualiza las primitivas seleccionadas actualmente desde el servidor" +#~ msgstr "" +#~ "Actualiza las primitivas seleccionadas actualmente desde el servidor" #~ msgid "Purging 1 primitive" @@ -28625,5 +28683,6 @@ #~ msgid "Failed to initialize API. Please try again later." #~ msgstr "" -#~ "No se ha podido inicializar la API. Por favor, inténtelo de nuevo más tarde." +#~ "No se ha podido inicializar la API. Por favor, inténtelo de nuevo más " +#~ "tarde." #~ msgid "API initialization failed" @@ -28654,8 +28713,4 @@ #~ msgstr "Historial del elemento" -#~ msgid "Sort" -#~ msgstr "Ordenar" - -#, java-format #~ msgid "Members: {0} (linked: {1})" #~ msgstr "Miembros: {0} (enlazados: {1})" @@ -28664,5 +28719,4 @@ #~ msgstr "Copiar predeterminados" -#, java-format #~ msgid "removing reference from way {0}" #~ msgstr "eliminando referencia de la vía {0}" @@ -28670,18 +28724,17 @@ #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" #~ msgstr "" -#~ "No se encontró ninguna primitiva con ID {0} y versión {1} en este conjunto " -#~ "de datos" +#~ "No se encontró ninguna primitiva con ID {0} y versión {1} en este " +#~ "conjunto de datos" #~ msgid "No data" #~ msgstr "Sin datos" -#, java-format #~ msgid "Remove relation member {0} {1}" #~ msgstr "Eliminando miembro de relación {0} {1}" -#, java-format #~ msgid "Failed to load history from the server. Details:
{0}" #~ msgstr "" -#~ "Fallo al cargar el historial desde el servidor. Detalles:
{0}" +#~ "Fallo al cargar el historial desde el servidor. Detalles:
{0}" #~ msgid "Download referrers from OSM..." @@ -28700,22 +28753,20 @@ #~ msgstr "El archivo no se encuentra." -#, java-format #~ msgid "" #~ "WARNING: launching browser windows for the first {0} of {1} selected " #~ "primitives only" #~ msgstr "" -#~ "ADVERTENCIA: lanzamiento de las ventanas del navegador por primera vez {0} " -#~ "de {1} solo seleccionados primitivos" +#~ "ADVERTENCIA: lanzamiento de las ventanas del navegador por primera vez " +#~ "{0} de {1} solo seleccionados primitivos" #~ msgid "Can't search because there is no loaded data." #~ msgstr "No se puede buscar porque no hay datos cargados." -#, java-format #~ msgid "" #~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" #~ msgstr "" -#~ "Hay cambios singrabar en la capa ''{0}''. ¿Eliminar la capa de todas formas?" - -#, java-format +#~ "Hay cambios singrabar en la capa ''{0}''. ¿Eliminar la capa de todas " +#~ "formas?" + #~ msgid "Do you really want to delete layer ''{0}''?" #~ msgstr "¿Está seguro que quiere eliminar la capa ''{0}''?" @@ -28730,10 +28781,8 @@ #~ msgstr "Cerrar el actual conjunto de cambios" -#, java-format #~ msgid "Use the existing changeset {0} and close it after upload" #~ msgstr "" #~ "Usar el conjunto de cambios existente {0} y cerrarlo después de subir" -#, java-format #~ msgid "" #~ "There are unsaved changes in {0} layer. Discard the changes and continue?" @@ -28741,21 +28790,19 @@ #~ "There are unsaved changes in {0} layers. Discard the changes and continue?" #~ msgstr[0] "" -#~ "Existen cambios sin guardar en la capa {0}. ¿Desea descartar los cambios y " -#~ "continuar?" +#~ "Existen cambios sin guardar en la capa {0}. ¿Desea descartar los cambios " +#~ "y continuar?" #~ msgstr[1] "" -#~ "Existen cambios sin guardar en las capas {0}. ¿Desea descartar los cambios y " -#~ "continuar?" - -#, java-format +#~ "Existen cambios sin guardar en las capas {0}. ¿Desea descartar los " +#~ "cambios y continuar?" + #~ msgid "Help page missing. Create it in English." #~ msgstr "Falta la página de ayuda. Créela en English." -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" -#~ "Falta la página de ayuda. Créela en English o su idioma." +#~ "Falta la página de ayuda. Créela en English o su idioma." #~ msgid "Didn't find an primitive with id {0} in this dataset" @@ -28767,11 +28814,10 @@ #~ msgid "" -#~ "Helppage missing. Create it in English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" #~ "Página de ayuda perdida. Crearla en English or spanish." -#, java-format #~ msgid "Unexpected return value. Got {0}." #~ msgstr "Retorno de valor inexperado. Obtenido {0}" @@ -28790,5 +28836,4 @@ #~ "no se encontró ninguna versión más reciente. El histórico está vacío." -#, java-format #~ msgid "Index out of bounds. Got {0}." #~ msgstr "índice fuera de los límites. Obtenido {0}" @@ -28797,27 +28842,24 @@ #~ msgstr "Mostrando el historial de la primitiva seleccionada" -#, java-format #~ msgid "" #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." #~ msgstr "" -#~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido " -#~ "\"{1}\"" - -#, java-format +#~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, " +#~ "obtenido \"{1}\"" + #~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''." +#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " +#~ "''{1}''." #~ msgstr "" #~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero (>=0), " #~ "obtenido \"{1}\"" -#, java-format #~ msgid "" #~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " #~ "relation?" #~ msgstr "" -#~ "La selección \"{0}\" se utiliza en la relación \"{1}\".
¿Eliminar " -#~ "de la relación?" - -#, java-format +#~ "La selección \"{0}\" se utiliza en la relación \"{1}\"." +#~ "
¿Eliminar de la relación?" + #~ msgid "Processing {0}" #~ msgstr "Procesando {0}" @@ -28826,13 +28868,11 @@ #~ msgstr "Reemplazar" -#, java-format #~ msgid "" -#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " -#~ "from relation?" +#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." +#~ "
Delete from relation?" #~ msgstr "" -#~ "La selección \"{0}\" se utiliza en la relación \"{1}\" con la función " -#~ "{2}.
¿Eliminar de la relación?" - -#, java-format +#~ "La selección \"{0}\" se utiliza en la relación \"{1}\" con la " +#~ "función {2}.
¿Eliminar de la relación?" + #~ msgid "Relation: from {0} to {1} via {2}" #~ msgstr "Relación: desde {0} a {1} a través de {2}" @@ -28844,6 +28884,6 @@ #~ msgstr "Por defecto (vea el texto emergente para información más detallada)" -#, java-format #~ msgid "The XML source (URL or filename) for {0} definition files." #~ msgstr "" -#~ "La fuente XML (URL o ruta del archivo) para los archivos de definición {0}." +#~ "La fuente XML (URL o ruta del archivo) para los archivos de definición " +#~ "{0}." Index: /applications/editors/josm/i18n/po/et.po =================================================================== --- /applications/editors/josm/i18n/po/et.po (revision 18974) +++ /applications/editors/josm/i18n/po/et.po (revision 18975) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 22:10+0100\n" -"PO-Revision-Date: 2009-11-29 15:23+0000\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-12-05 21:18+0000\n" "Last-Translator: lyyser \n" "Language-Team: Estonian \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:05+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:19+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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" @@ -116,5 +115,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 @@ -137,9 +136,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 @@ -155,20 +154,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 @@ -187,7 +182,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 "Viga" @@ -267,5 +262,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 "Lisand programmid" @@ -306,4 +301,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 @@ -311,8 +308,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 @@ -322,29 +319,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 @@ -424,14 +419,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 "Laiuskraad" #: ../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 "Pikkuskraad" @@ -457,10 +452,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 @@ -491,19 +486,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 @@ -512,9 +510,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 @@ -530,7 +525,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 @@ -542,11 +537,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" @@ -634,5 +629,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}" @@ -685,10 +680,10 @@ msgstr "Ei saa teid ühendada. Ei saa liita üheks sõlmejadaks." -#: ../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 "Ühenda {0} teed." -#: ../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 "Palun vali vähemalt kaks teed, mida sobitada." @@ -707,19 +702,19 @@ msgstr "Palun vali kopeerimiseks mõni objekt." +#: ../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 "Moodusta ring" -#: ../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 "Moodusta valitud kolmest sõlmest ring." -#: ../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 "Sõlmed ei moodusta ringi. Katkestan." -#: ../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 +725,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 +799,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 +825,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 +853,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 "Kahekordista" @@ -887,5 +886,5 @@ #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32 msgid "Toggle fullscreen view" -msgstr "" +msgstr "Täisekraanvaate sisse-/väljalülitamine" #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33 @@ -909,8 +908,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 +915,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 +926,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 +946,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 +970,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 +1017,100 @@ msgstr "Kuvab info OSM teede, sõlmede ja relatsioonide objektide kohta." +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "Kattuvate alade ühendamine" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Joins areas that overlap each other" +msgstr "Ühendab üksteist katvad alad" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +msgid "Only up to two areas can be joined at the moment." +msgstr "Praegu saab ühendada ainult kuni kaks ala." + +#: ../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 "Sisesta kõigi vastuolude kohta väärtused." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Lahenda vastuolud." + +#: ../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 +1130,45 @@ msgstr "Ei ole shortcuti." +#: ../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 +1179,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 "Liida sõlmed." -#: ../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 "Liida sõlmed vanimaks." -#: ../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 "Palun vali vähemalt kaks sõlme mida liita." -#: ../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 +1206,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" @@ -1461,9 +1596,43 @@ #: ../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 "Sulge" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Lihtsusta tee" + +#: ../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 "Palun vali lihtsustamiseks vähemalt üks tee." + +#: ../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] "" +"Valik sisaldab {0} teed. Kas oled kindel, et soovid seda lihtsustada?" +msgstr[1] "" +"Valik sisaldab {0} teed. Kas oled kindel, et soovid neid lihtsustada?" + +#: ../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] "Lihtsusta tee (eemalda {0} sõlm)" +msgstr[1] "Lihtsusta tee (eemalda {0} sõlme)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1676,52 +1845,52 @@ #. #: ../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 "Andmete allalaadimine" -#: ../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 "Uuenda valik" -#: ../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 "Uuenda valik" +#: ../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 "Tühi valik" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 msgid "Update objects" msgstr "Uuenda objektid" -#: ../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 "Lae andmed üles" -#: ../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 "" @@ -1730,35 +1899,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 "Pole muudatusi mida üles laadida." -#: ../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 "Midagi pole üles laadida. Hangi esmalt andmeid." -#: ../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 "Sünkroniseeri kogu andmekogu" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1772,11 +1941,11 @@ 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 +#: ../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 "" @@ -1787,5 +1956,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1795,22 +1964,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 "" @@ -1821,15 +1990,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 "Primitiivi uuendamine" @@ -1842,5 +2011,5 @@ #. 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 "" @@ -1849,37 +2018,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 +#: ../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:45 +#: ../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 "" @@ -2109,38 +2278,38 @@ msgstr "valitud" -#: ../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 "Sõlme ei saa lisada maailmast väljapoole." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Lisa punkt" -#: ../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 "Lisa teele sõlm" -#: ../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 "Ühenda olemasolev tee sõlmega" -#: ../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 "Ühenda uus sõlm olemasoleva teega" -#: ../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 "Lisa sõlm teele ja ühenda" -#: ../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 "Loo uus sõlm." -#: ../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 "Vali kursori all olev sõlm." -#: ../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." @@ -2149,14 +2318,14 @@ msgstr[1] "Lisa {0} teele uus sõlm." -#: ../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 "Alusta uut teed viimasest sõlmest." -#: ../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 "Jätke teed viimasest sõlmest." -#: ../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 "Lõpeta joonistamine." @@ -2367,12 +2536,16 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +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-" @@ -2380,43 +2553,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 @@ -2426,55 +2599,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 "Otsi" -#: ../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 "Alusta otsingut" -#: ../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 "" -#: ../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 "Leitud {0} vastet" -#: ../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 "" @@ -2484,40 +2657,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 "Võtme väärtus ei saa olla tühi. Näide: võti=väärtus" -#: ../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 "" @@ -2526,9 +2699,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 "" @@ -2537,5 +2710,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." @@ -2586,6 +2759,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 "" @@ -2593,5 +2765,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 "" @@ -2727,5 +2899,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 "" @@ -2744,5 +2916,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 "" @@ -2761,19 +2934,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" @@ -2782,5 +2955,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" @@ -2789,5 +2962,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" @@ -2796,5 +2969,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" @@ -2805,6 +2978,6 @@ #. 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 +#: ../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." @@ -2813,5 +2986,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "" @@ -2829,15 +3002,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 "" @@ -2846,5 +3019,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}" @@ -2854,9 +3027,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 "" @@ -2936,5 +3104,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 " @@ -3172,25 +3340,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 @@ -3213,25 +3381,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}" @@ -3240,5 +3409,5 @@ #. 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 "" @@ -3301,24 +3470,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 " @@ -3326,5 +3495,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 "" @@ -3356,6 +3525,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}." @@ -3376,5 +3545,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 @@ -3395,135 +3563,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 "" +#: ../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 "" + +#: ../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 "" + +#: ../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:557 +msgid "More than one \"to\" way found." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:922 -#, java-format -msgid "Deleted member ''{0}'' in relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:930 -#, java-format -msgid "Way ''{0}'' with less than two points." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -msgid "More than one \"from\" way found." +#: ../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:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#, java-format +msgid "Unknown role ''{0}''." msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 -msgid "More than one \"to\" way found." +#, java-format +msgid "Unknown member type for ''{0}''." msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -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 -#, java-format -msgid "Unknown role ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 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:832 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "" + +#: ../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:891 #, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:903 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950 -#, 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 "" -#: ../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}" @@ -3535,5 +3703,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 @@ -3552,5 +3720,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 @@ -3570,5 +3738,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 "taust" @@ -3699,5 +3867,5 @@ msgstr "Rohkem ei näidata" -#: ../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 @@ -3705,32 +3873,32 @@ msgstr "" -#: ../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" @@ -3739,5 +3907,5 @@ msgstr[1] "{0} punkti" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -3984,12 +4152,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Fail" -#: ../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 @@ -4003,19 +4171,19 @@ msgstr "Muuda" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Vaade" -#: ../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 "Tööriistad" -#: ../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 "Eelseaded" -#: ../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 @@ -4026,5 +4194,5 @@ msgstr "Menüü: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Heli" @@ -4068,29 +4236,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 " @@ -4098,9 +4266,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 "" @@ -4237,5 +4405,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 @@ -4252,5 +4420,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" @@ -4322,22 +4490,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." @@ -4724,5 +4892,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 "" @@ -4857,5 +5025,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 "" @@ -4955,7 +5123,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" @@ -4965,6 +5133,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" @@ -4998,7 +5166,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 "" @@ -5087,5 +5253,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 @@ -5228,18 +5394,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 "Ajalugu" -#: ../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 "Näita kõigi valitud objektide ajalugu." -#: ../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 @@ -5249,13 +5415,13 @@ msgstr "Lae uuesti" -#: ../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 "Lae kõik hetkel valitud objektid uuesti ja värskenda nimekirja." -#: ../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 "" @@ -5448,5 +5614,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 "" @@ -5489,25 +5655,25 @@ msgstr "Suurenda valikule" -#: ../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 "Valik: Suhted:{0} / Teed:{1} / Punktid:{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 "Valik" -#: ../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 "Valik: {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 "Lase paneel vabaks" -#: ../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." @@ -5515,5 +5681,5 @@ "Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal." -#: ../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 "Vajuta et minimeerida/maksimeerida paneeli sisu" @@ -5573,37 +5739,37 @@ msgstr "# Objekti" -#: ../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 "Konfliktid andmetes" -#: ../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 "" @@ -5612,35 +5778,62 @@ 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] "Lae alla kõik sellest seosest puudu olevad teed ja puntid" +msgstr[1] "Lae alla kõik sellest seosest puudu olevad teed ja puntid" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Allalaadimise asukoht" + +#: ../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 +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 "Ava toimetajas valitud seos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562 msgid "" "There is at least one member in this relation referring
to the " @@ -5649,14 +5842,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java: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 "" @@ -5666,9 +5859,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 +#: ../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 "" @@ -5678,15 +5871,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 " @@ -5694,5 +5887,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 " @@ -5700,20 +5893,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 "" @@ -5722,66 +5915,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 "Sport" + +#: ../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 "Liiguta hetkel valitud liiget ülespoole" #. 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 "Liiguta hetkel valitud liiget allapoole" #. 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 " @@ -5790,9 +5987,9 @@ 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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 #, java-format msgid "" @@ -5801,41 +5998,48 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 msgid "Apply the current updates" msgstr "Rakenda jooksvad uuendused" -#: ../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 "Lae alla kõik sellest seosest puudu olevad teed ja puntid" -#: ../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 "Lae alla liikmed" -#: ../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 "" @@ -5845,41 +6049,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 "" @@ -5919,19 +6116,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}''" @@ -6892,5 +7089,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 @@ -7398,13 +7595,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}" @@ -7655,5 +7852,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 " @@ -7661,5 +7858,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 "" @@ -7732,40 +7929,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 "Objektid lisada:" -#: ../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 "Objektid muuta:" -#: ../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 "Objektid kustutada:" -#: ../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:" @@ -7774,5 +7971,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:" @@ -7781,5 +7978,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:" @@ -7788,70 +7985,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 "Lae muudatused üles" -#: ../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 "Palun sisesta enne soovitud kordinaadid." + +#: ../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 "" -"Lülita sisse kõikide muudatuste laadimiseks ühe päringuga, lülita välja iga " -"muudetud primitiivi kohta eraldi päringu kasutamiseks" - -#: ../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 "Esitada lühike kommentaar üleslaetavatele muutustele:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../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 "Lae andmed juba avatud muutustekogumisse" -#: ../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}" @@ -7859,16 +8053,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}." @@ -7877,5 +8071,5 @@ #. 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 "" @@ -7884,5 +8078,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 "" @@ -7912,111 +8106,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 -#, java-format -msgid "Cannot read time \"{0}\" from point {1} x {2}" -msgstr "" - -#: ../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 "" - -#: ../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 "" - -#: ../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] "pilt" -msgstr[1] "pildid" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Sünkroniseeri kell" - -#: ../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 "" - -#: ../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 "Pilt" - -#: ../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 +#, fuzzy +msgid "Upload data in one request" +msgstr "Lae andmed juba avatud muutustekogumisse" + +#: ../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 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" + +#: ../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 "Palun sisesta otsingutekst" + +#: ../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 @@ -8024,30 +8163,30 @@ msgstr "" -#: ../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 @@ -8055,5 +8194,5 @@ msgstr "Kohanda värvi" -#: ../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 @@ -8062,5 +8201,5 @@ msgstr "Vaikimisi" -#: ../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 @@ -8069,18 +8208,18 @@ msgstr "Vali värv" -#: ../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 "Heli import" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219 #, java-format msgid "" @@ -8090,23 +8229,23 @@ 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: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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301 msgid "Import images" msgstr "Piltide import" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306 #, java-format msgid "" @@ -8116,11 +8255,16 @@ 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:336 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31 +msgid "JPEG images (*.jpg)" +msgstr "" + +#: ../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 "" -#: ../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 @@ -8128,5 +8272,5 @@ msgstr "" -#: ../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" @@ -8136,5 +8280,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 @@ -8142,22 +8286,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, " @@ -8166,5 +8305,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" @@ -8173,10 +8312,10 @@ 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 "Muuda andme kihiks" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8186,11 +8325,11 @@ "kahjulikuks.
Kui soovite üles laadida radasid, vaata siia:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8200,29 +8339,29 @@ msgstr "Muudetud sellest: {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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8231,9 +8370,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 " @@ -8241,5 +8380,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 " @@ -8247,23 +8386,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 "Andmekiht {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." @@ -8272,5 +8411,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 "" @@ -8284,5 +8423,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 "" @@ -8295,11 +8434,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" @@ -8308,32 +8447,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 "" -#: ../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 "" @@ -8379,4 +8518,343 @@ msgstr[1] "{0} punkti" +#: ../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 "Viga {0} parsimisel" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Ei suutnud lugeda \"{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 "" + +#: ../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] "pilt" +msgstr[1] "pildid" + +#: ../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 "Vaateseadistused" + +#: ../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" @@ -8676,5 +9154,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 @@ -8989,18 +9467,18 @@ #: ../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 "Välimus ja tunnetus" -#: ../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 "" @@ -9451,5 +9929,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 "Rohkem teavet sellest funktsioonist" @@ -9536,5 +10014,5 @@ msgstr "Laen alla punkte alates {0} kuni {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 @@ -9542,5 +10020,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9660,13 +10138,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 +#: ../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:308 +#: ../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 @@ -9694,24 +10172,31 @@ 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] "Laen alla punkte alates {0} kuni {1}..." +msgstr[1] "Laen alla punkte alates {0} kuni {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9753,27 +10238,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 "" @@ -9781,66 +10266,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 "Sulgen muutustekogumit..." -#: ../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 "Ettevalmistus..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Üleslaadimine..." -#: ../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 "Jooksev muutustekogum on tühi. Ei saa andmeid üles laadida." -#: ../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}." @@ -9875,5 +10360,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}''." @@ -9900,5 +10385,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}." @@ -9906,5 +10391,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}" @@ -9917,5 +10402,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}''." @@ -10066,5 +10551,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "" @@ -10073,38 +10558,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../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 +#: ../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:273 +#: ../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 "" @@ -10112,19 +10597,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 "Puudulik määratlus ref=0" -#: ../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 "Keelatud objekti number 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 "" @@ -10134,8 +10619,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 "" @@ -10145,25 +10630,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 "" @@ -10171,5 +10656,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10178,5 +10663,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10184,5 +10669,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10191,13 +10676,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 "Valmistan ette OSM andmeid..." -#: ../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 "" @@ -10250,4 +10735,10 @@ msgid "Contacting Server..." msgstr "Ühendun serveriga..." + +#: ../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 @@ -10285,42 +10776,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 "" @@ -10362,17 +10854,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 "Kustuta {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}." @@ -10384,10 +10886,10 @@ msgstr "Pistikus {0} tekkis viga" -#: ../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 "" @@ -10397,5 +10899,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 msgid "" "You updated your JOSM software.\n" @@ -10404,50 +10906,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 " @@ -10457,9 +10959,9 @@ "on piisavalt õigusi olemasolevate pistikrakenduste ülekirjutamiseks." -#: ../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 "" @@ -10467,19 +10969,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 " @@ -10487,13 +10989,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" @@ -11006,5 +11508,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" @@ -11019,12 +11521,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 @@ -11032,439 +11532,142 @@ 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 +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 "looduslik" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "pilt" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Valimisringkond" + +#: ../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 "siseosa" + +#: ../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 "Viga {0} parsimisel" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Ei suutnud lugeda \"{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 "" @@ -11919,12 +12122,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] "Lihtsusta tee (eemalda {0} sõlm)" -msgstr[1] "Lihtsusta tee (eemalda {0} sõlme)" - #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 @@ -12036,14 +12231,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 " @@ -12351,4 +12546,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" @@ -12393,17 +12592,17 @@ #. * 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" @@ -12639,20 +12838,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 "" @@ -12948,9 +13146,10 @@ msgstr "Tundmatu faililaiend: {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 " @@ -12958,9 +13157,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 "" @@ -13333,17 +13528,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 "" @@ -13386,162 +13581,4 @@ #: ../plugins/terracer/src/terracer/TerracerAction.java:475 msgid "Optional" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "Kattuvate alade ühendamine" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Joins areas that overlap each other" -msgstr "Ühendab üksteist katvad alad" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 -msgid "Only up to two areas can be joined at the moment." -msgstr "Praegu saab ühendada ainult kuni kaks ala." - -#: ../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 "Sisesta kõigi vastuolude kohta väärtused." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Lahenda vastuolud." - -#: ../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 "Lihtsusta tee" - -#: ../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 "Palun vali lihtsustamiseks vähemalt üks tee." - -#: ../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] "" -"Valik sisaldab {0} teed. Kas oled kindel, et soovid seda lihtsustada?" -msgstr[1] "" -"Valik sisaldab {0} teed. Kas oled kindel, et soovid neid lihtsustada?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" msgstr "" @@ -13638,5 +13675,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}" @@ -13689,34 +13726,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 "" @@ -13765,18 +13802,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 "" @@ -14374,14 +14411,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 " @@ -14390,14 +14427,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 "" @@ -14406,5 +14443,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 "" @@ -14416,13 +14453,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." @@ -14576,50 +14613,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 "" @@ -14731,21 +14768,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 " @@ -14757,21 +14789,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 " @@ -14780,10 +14812,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 " @@ -14792,20 +14824,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 " @@ -14815,16 +14847,16 @@ #. Plugin lakewalker -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Aitab WMS kujutisi vektoriseerida" #. Plugin livegps +#: build/trans_plugins.java:31 +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 " @@ -14834,10 +14866,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 " @@ -14846,5 +14878,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 " @@ -14854,27 +14886,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 " @@ -14883,15 +14915,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 +msgid "Let other applications send commands to JOSM." +msgstr "" + +#. Plugin routes #: build/trans_plugins.java:55 -msgid "Let other applications send commands to JOSM." -msgstr "" - -#. Plugin routes -#: build/trans_plugins.java:57 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -14900,10 +14932,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 " @@ -14912,15 +14944,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 " @@ -14930,17 +14962,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 " @@ -14949,5 +14974,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -14956,10 +14981,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, ...)." @@ -19793,5 +19818,5 @@ #: build/trans_presets.java:1938 msgid "Miniature Golf" -msgstr "" +msgstr "Miniatuurne golf" #. item "Sports/Sport Facilities/Miniature Golf" @@ -19802,10 +19827,10 @@ #: build/trans_presets.java:1945 msgid "Sport" -msgstr "" +msgstr "Sport" #. group "Sport" #: build/trans_presets.java:1946 msgid "Multi" -msgstr "" +msgstr "Mitu" #. item "Sport/Multi" @@ -19991,5 +20016,5 @@ #: build/trans_presets.java:1958 msgid "Athletics" -msgstr "" +msgstr "Kergejõustik" #. item "Sport/Athletics" @@ -20000,5 +20025,5 @@ #: build/trans_presets.java:1964 msgid "Archery" -msgstr "" +msgstr "Vibusport" #. item "Sport/Archery" @@ -20859,5 +20884,5 @@ #: build/trans_presets.java:2348 msgid "oil" -msgstr "" +msgstr "õli" #: build/trans_presets.java:2348 build/trans_presets.java:2390 @@ -20978,5 +21003,5 @@ #: build/trans_presets.java:2390 msgid "photovoltaic" -msgstr "" +msgstr "päikeseenergia" #. item "Man Made/Power Generator" text "Name" @@ -21052,10 +21077,10 @@ #: build/trans_presets.java:2423 msgid "Line type" -msgstr "" +msgstr "Joonetüüp" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2423 msgid "line" -msgstr "" +msgstr "joon" #: build/trans_presets.java:2423 @@ -21081,13 +21106,13 @@ #: build/trans_presets.java:2428 msgid "single" -msgstr "" +msgstr "üksik" #: build/trans_presets.java:2428 msgid "double" -msgstr "" +msgstr "topelt" #: build/trans_presets.java:2428 msgid "triple" -msgstr "" +msgstr "kolmekordne" #: build/trans_presets.java:2428 @@ -21218,27 +21243,27 @@ #: build/trans_presets.java:2475 msgid "Material" -msgstr "" +msgstr "Materjal" #. item "Amenities/Bench" combo "Material" #: build/trans_presets.java:2475 msgid "stone" -msgstr "" +msgstr "kivi" #: build/trans_presets.java:2475 msgid "plastic" -msgstr "" +msgstr "plastikust" #: build/trans_presets.java:2476 msgid "Colour" -msgstr "" +msgstr "Värv" #. item "Amenities/Bench" combo "Colour" #: build/trans_presets.java:2476 msgid "black" -msgstr "" +msgstr "must" #: build/trans_presets.java:2476 msgid "brown" -msgstr "" +msgstr "pruun" #. color historic @@ -21317,17 +21342,17 @@ #: build/trans_presets.java:2476 msgid "red" -msgstr "" +msgstr "punane" #: build/trans_presets.java:2476 msgid "blue" -msgstr "" +msgstr "sinine" #: build/trans_presets.java:2476 msgid "gray" -msgstr "" +msgstr "hall" #: build/trans_presets.java:2476 msgid "white" -msgstr "" +msgstr "valge" #: build/trans_presets.java:2477 @@ -21913,5 +21938,5 @@ #: build/trans_presets.java:2788 msgid "Geography" -msgstr "" +msgstr "Geograafia" #. group "Geography" @@ -22668,5 +22693,5 @@ #. #. -#. +#. #. color bicycle #. @@ -22676,5 +22701,5 @@ #. #. -#. +#. #. color bicycle #. @@ -27066,4 +27091,17 @@ #~ msgstr "Lae OSMi serverisse" +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Lülita sisse kõikide muudatuste laadimiseks ühe päringuga, lülita välja " +#~ "iga muudetud primitiivi kohta eraldi päringu kasutamiseks" + +#~ msgid "Sync clock" +#~ msgstr "Sünkroniseeri kell" + +#~ msgid "Image" +#~ msgstr "Pilt" + #~ msgid "Move" #~ msgstr "Liiguta" @@ -27071,7 +27109,4 @@ #~ msgid "Data Layer" #~ msgstr "Andmekiht" - -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Palun sisesta enne soovitud kordinaadid." #~ msgid "Select a bookmark first." @@ -27142,7 +27177,4 @@ #~ msgstr "nimi" -#~ msgid "Please enter a search string" -#~ msgstr "Palun sisesta otsingutekst" - #~ msgid "Cannot read place search results from server" #~ msgstr "Ei saa lugeda kohaotsingu tulemusi serverist" @@ -27335,7 +27367,4 @@ #~ msgstr "Andmeid ei imporditud." -#~ msgid "Delete {1} {0}" -#~ msgstr "Kustuta {1} {0}" - #~ msgid "Conflicting relation" #~ msgstr "Konfliktne relatsioon" Index: /applications/editors/josm/i18n/po/fi.po =================================================================== --- /applications/editors/josm/i18n/po/fi.po (revision 18974) +++ /applications/editors/josm/i18n/po/fi.po (revision 18975) @@ -8,7 +8,7 @@ "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-08 14:30+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-12-01 17:02+0000\n" +"Last-Translator: Mika Laari \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:06+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:18+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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" @@ -116,5 +115,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 @@ -137,9 +136,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 @@ -155,20 +154,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 @@ -187,7 +182,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 "Virhe" @@ -259,5 +254,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81 msgid "Contribution" -msgstr "" +msgstr "Tekijät" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82 @@ -267,5 +262,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 "Liitännäiset" @@ -308,4 +303,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 @@ -313,8 +310,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 @@ -324,29 +321,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 @@ -375,6 +370,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 "" "Valittua tasoa
{0}
ei voi yhdistää mihinkään nykyisistä " @@ -428,14 +423,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 "Leveysaste" #: ../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 "Pituusaste" @@ -443,17 +438,17 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 msgid "Please enter a valid latitude in the range -90..90" -msgstr "" +msgstr "Syötä kelvollinen leveyspiiri väliltä -90–90" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 msgid "Please enter a latitude in the range -90..90" -msgstr "" +msgstr "Syötä leveyspiiri väliltä -90–90" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 msgid "Please enter a valid longitude in the range -180..180" -msgstr "" +msgstr "Syötä kelvollinen pituuspiiri väliltä -180–180" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 msgid "Please enter a longitude in the range -180..180" -msgstr "" +msgstr "Syötä pituuspiiri väliltä -180–180" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 @@ -461,10 +456,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 @@ -476,9 +471,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 msgid "Close the dialog and create a new node" -msgstr "" +msgstr "Sulje ikkuna ja tee uusi solmu" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 msgid "Close the dialog, don't create a new node" -msgstr "" +msgstr "Sulje ikkuna tekemättä uutta solmua" #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 @@ -495,19 +490,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 @@ -516,9 +514,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 @@ -534,7 +529,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 @@ -546,11 +541,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" @@ -638,5 +633,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}" @@ -689,10 +684,10 @@ "Polkuja ei voitu yhdistää. (Niitä ei voitu yhdistää yhdeksi pistejonoksi)" -#: ../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 "Yhdistä {0} polkua" -#: ../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 "Valitse ainakin kaksi yhdistettävää polkua." @@ -711,19 +706,19 @@ msgstr "Valitse jotain kopioitavaksi." +#: ../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 "Luo ympyrä" -#: ../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 "Luo ympyrän kolmesta valitusta pisteestä." -#: ../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 "Valituista pisteistä ei voi muodostaa ympyrää." -#: ../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 " @@ -735,9 +730,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 @@ -809,21 +804,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" @@ -831,6 +830,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 @@ -845,19 +844,19 @@ #, java-format msgid "({0}/{1}) Loading parents of node {2}" -msgstr "" +msgstr "({0}/{1}) Ladataan solmun {2} emoelementit" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257 #, java-format msgid "({0}/{1}) Loading parents of way {2}" -msgstr "" +msgstr "({0}/{1}) Ladataan polun {2} emoelementtejä" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:258 #, java-format msgid "({0}/{1}) Loading parents of relation {2}" -msgstr "" +msgstr "({0}/{1}) Ladataan suhteen {2} emoelementtejä" #: ../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 "Monista" @@ -887,14 +886,14 @@ #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30 msgid "Fullscreen View" -msgstr "" +msgstr "Kokoruututila" #. no icon #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32 msgid "Toggle fullscreen view" -msgstr "" +msgstr "Kokoruututila päälle/pois" #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33 msgid "Toggle Fullscreen view" -msgstr "" +msgstr "Kokoruututila päälle/pois" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -914,8 +913,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 @@ -923,5 +920,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 @@ -934,8 +931,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 @@ -954,8 +951,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 @@ -978,13 +975,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 @@ -1000,5 +998,5 @@ #, java-format msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." -msgstr "" +msgstr "Odotettiin OsmDataLayer- tai GpxLayer-instanssia. Saatiin \"{0}\"." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 @@ -1024,4 +1022,104 @@ msgstr "Näytä tietoja OSM-pisteistä, -poluista tai -relaatioista." +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "Yhdistä päällekkäiset alueet" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Joins areas that overlap each other" +msgstr "Yhdistää alueet jotka ovat osittain toistensa päällä" + +#: ../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 "" +"Valituilla poluilla on pisteitä ladatun alueen ulkopuolella.\n" +"Tämä voi mahdollisesti johtaa muiden polkujen käytössä olevien pisteiden " +"poistamiseen.\n" +"Oletko varma, että haluat jatkaa?" + +#: ../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 "Syötä arvot kaikille ristiriidoille." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Ratkaise ristiriitoja" + +#: ../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 @@ -1041,4 +1139,45 @@ msgstr "Ei pikanäppäintä" +#: ../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" @@ -1049,32 +1188,34 @@ msgstr "Liitä nykyinen taso toiseen tasoon" +#: ../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 "Yhdistä pisteet" -#: ../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 "Yhdistää pisteet vanhimpaan." -#: ../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 "Valitse vähintään kaksi yhdistettävää pistettä." -#: ../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 +msgstr "Peru sulautus" + +#: ../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 +msgstr "Voit keskeytettää solmujen yhteensulautuksen napsauttamalla tästä" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135 #, java-format msgid "" "Cannot merge nodes: Would have to delete way ''{0}'' which is still used." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264 +"Solmuja ei voi sulauttaa yhteen: Polku ''{0}'' pitäisi poistaa, mutta se on " +"vielä käytössä." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231 #, java-format msgid "Merge {0} nodes" @@ -1216,5 +1357,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109 msgid "Download Data" -msgstr "" +msgstr "Lataa dataa" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 @@ -1226,6 +1367,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46 msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "" -"Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°" +msgstr "Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 @@ -1453,6 +1593,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 "Näytä tilaraportti virheraportteihin liittäessä hyödyllisin tiedoin." @@ -1472,9 +1611,42 @@ #: ../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 "Sulje" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Yksinkertaista polku" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Poistaa turhat pisteet polusta." + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "Valitse vähintään yksi polku jonka haluat yksinkertaistaa." + +#: ../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] "Valinnassa on {0} polku. Haluatko varmasti yksinkertaistaa sen?" +msgstr[1] "" +"Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 +msgid "Are you sure?" +msgstr "Oletko varma?" + +#: ../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 @@ -1605,6 +1777,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 "" "* Yksi piste, joka on useamman polun käytössä ja yksi noista poluista, tai" @@ -1688,54 +1859,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 "Päivittää valitut objektit palvelimelta (uudelleenlataa tiedot)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 msgid "Update Selection" msgstr "Päivitä valinta" +#: ../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 "Valinta tyhjä" -#: ../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 "Lähetä tietoa" -#: ../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 "" @@ -1746,35 +1917,35 @@ "ensin." -#: ../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 "Ei lähetettäviä muutoksia." -#: ../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 "Ei mitään lähetettävää. Hae ensin dataa." -#: ../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 "Synkronoi koko tiedosto" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1782,28 +1953,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 "" @@ -1813,22 +1982,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 msgid "Changeset closed" msgstr "Muutoskokoelma suljettu" -#: ../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 "" @@ -1839,15 +2008,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 "" @@ -1859,6 +2028,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 "" @@ -1867,38 +2036,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 "Lähetä valinta" -#: ../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 "Lähetä kaikki valittujen objektion muutokset OSM-palvelimelle" -#: ../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 "" @@ -2062,6 +2230,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 "" @@ -2131,38 +2299,38 @@ msgstr "valitut" -#: ../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 "Maailman ulkopuolelle ei voi lisätä pistettä." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Lisää piste" -#: ../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 "Lisää piste polkuun" -#: ../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 "Yhdistä olemassa oleva polku pisteeseen" -#: ../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 "Lisää uusi piste olemassa olevaan polkuun" -#: ../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 "Lisää piste polkuun ja yhdistä" -#: ../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 "Luo uusi piste." -#: ../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 "Valitse kursorin alla oleva piste." -#: ../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." @@ -2171,14 +2339,14 @@ msgstr[1] "Lisää uusi piste {0} polkuun." -#: ../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 "Aloita uusi polku viimeisestä pisteestä." -#: ../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 "Jatka polkua viimeisestä pisteestä." -#: ../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 "Lopeta piirtäminen." @@ -2214,6 +2382,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 "" @@ -2264,6 +2432,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." -msgstr "" -"Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet." +msgstr "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet." #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 @@ -2311,5 +2478,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." @@ -2392,12 +2559,16 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +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-" @@ -2405,43 +2576,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 @@ -2451,55 +2622,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 "Etsi" -#: ../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 "Hakusanalla \"{0}\" ei löytynyt mitään" -#: ../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 "Valintaan ei lisätty mitään haulla \"{0}\"" -#: ../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 "Valinnasta ei poistettu mitään haulla \"{0}\"" -#: ../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 "Löytyi {0} osumaa" -#: ../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 "" @@ -2512,40 +2683,40 @@ "{2}" -#: ../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 "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri." -#: ../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 "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri." -#: ../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 "Päättävä sulkumerkki puuttuu." -#: ../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 "" @@ -2554,9 +2725,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 "" @@ -2565,5 +2736,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." @@ -2616,6 +2787,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 "" @@ -2623,5 +2793,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 "" @@ -2757,5 +2927,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 "" @@ -2774,5 +2944,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 "" @@ -2791,19 +2962,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" @@ -2812,5 +2983,5 @@ msgstr[1] "Poista {0} objektia" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2819,5 +2990,5 @@ msgstr[1] "Poista {0} pistettä" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2826,5 +2997,5 @@ msgstr[1] "Poista {0} polkua" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2835,16 +3006,16 @@ #. 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?" +#: ../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 "" "Olet aikeissa poistaa pisteitä ladatun alueen ulkopuolelta.
Tämä voi " -"johtaa ongelmiin, koska objektit, joita et näe voivat käyttää " -"niitä.
Oletko varma, että haluat poistaa ne?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +"johtaa ongelmiin, koska objektit, joita et näe voivat käyttää niitä." +"
Oletko varma, että haluat poistaa ne?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "" @@ -2862,15 +3033,15 @@ msgstr[1] "Siirrä {0} pistettä" -#: ../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 "" @@ -2879,5 +3050,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}" @@ -2887,9 +3058,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 "" @@ -2969,5 +3135,5 @@ msgstr "Toteutetaanko?" -#: ../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 " @@ -3112,6 +3278,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 "" @@ -3194,5 +3360,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3201,5 +3367,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3207,25 +3373,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 "E" #. 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 "P" #. 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 "L" #. 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 "I" #: ../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 @@ -3248,25 +3414,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}" @@ -3274,6 +3441,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 "" @@ -3336,24 +3503,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 " @@ -3361,5 +3528,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 "" @@ -3391,6 +3558,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}." @@ -3411,5 +3578,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 @@ -3421,6 +3587,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 "" @@ -3431,137 +3596,136 @@ 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 "" -#: ../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 "Poistettu jäsen \"{0}\" relaatiossa." -#: ../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 "Polussa \"{0}\" on vähemmän kuin kaksi pistettä." -#: ../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 "Löytyi enemmän kuin yksi \"from\" -polku" -#: ../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 "Löytyi enemmän kuin yksi \"to\" -polku" -#: ../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 "Useita \"via\" -jäseniä." -#: ../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 "Tuntematon rooli \"{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 "" -#: ../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 "Ei \"from\"-roolin tietä." -#: ../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 "Ei \"to\"-roolin tietä." -#: ../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 "Ei löytynyt pistettä tai tietä \"via\"-roolissa." -#: ../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 "" "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen." +#: ../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 "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen." + #: ../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 "" -"\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen." - -#: ../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 "Kiellolle {0} ei löydy piirtotyyliä." -#: ../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 "Inner-roolin tie \"{0}\" relaation teistä uloimpana." -#: ../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 "Multipolygonissa jäsenenä muu kuin tie: {0}" -#: ../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 "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista." -#: ../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 "ei tageja" -#: ../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 "teksti" -#: ../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 "Virhe: {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}" @@ -3573,5 +3737,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 @@ -3590,5 +3754,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 @@ -3608,5 +3772,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 "tausta" @@ -3724,6 +3888,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 "" @@ -3738,5 +3901,5 @@ msgstr "Älä näytä uudelleen" -#: ../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 @@ -3744,32 +3907,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 "keskeneräinen" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "tie" -#: ../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 "rata" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "vesiväylä" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "maankäyttö" -#: ../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" @@ -3778,5 +3941,5 @@ msgstr[1] "{0} pistettä" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -4017,12 +4180,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Tiedosto" -#: ../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 @@ -4036,19 +4199,19 @@ msgstr "Muokkaa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Näytä" -#: ../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 "Työkalut" -#: ../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 "Esivalinnat" -#: ../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 @@ -4059,5 +4222,5 @@ msgstr "Valikko: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Ääni" @@ -4101,29 +4264,29 @@ msgstr "skaalaus" -#: ../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 "Pituusaste osoittimen kohdalla." -#: ../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 "Osoittmen kohdalla olevan objektin nimi." -#: ../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 "Leveysaste osoittimen kohdalla." -#: ../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 "Edellisen ja tämänhetkisen segmentin välinen kulma." -#: ../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 "Piirrettävän segmentin suuntima." -#: ../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 "Piirrettävän segmentin pituus." -#: ../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 " @@ -4131,9 +4294,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(ei objektia)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "" @@ -4239,5 +4402,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" @@ -4246,5 +4409,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" @@ -4253,5 +4416,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" @@ -4270,5 +4433,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 @@ -4285,5 +4448,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" @@ -4355,22 +4518,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." @@ -4449,6 +4612,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 "" @@ -4517,6 +4679,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" @@ -4524,6 +4686,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" @@ -4580,6 +4742,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 "" @@ -4612,7 +4774,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 "" @@ -4758,5 +4920,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 "" @@ -4891,5 +5053,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 "" @@ -4989,7 +5151,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" @@ -4999,6 +5161,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" @@ -5032,7 +5194,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 "" @@ -5122,5 +5282,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 @@ -5185,10 +5345,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 "" @@ -5263,18 +5422,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 "Historia" -#: ../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 "Näytä valittujen kohteiden historia." -#: ../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 @@ -5284,13 +5443,13 @@ msgstr "Lataa uudelleen" -#: ../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 "Lataa kaikki valitut objektit uudelleen ja päivitä lista." -#: ../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 "" @@ -5483,5 +5642,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 "" @@ -5524,25 +5683,25 @@ msgstr "Sovita näkymä valintaan" -#: ../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 "Valinta: Rel.:{0}/Polut:{1}/Pisteet:{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 "Valinta" -#: ../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 "Valinta: {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 "Irroita paneeli" -#: ../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." @@ -5551,5 +5710,5 @@ "työkalupalkin napista." -#: ../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 "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön" @@ -5609,37 +5768,37 @@ msgstr "# Objektia" -#: ../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 "" @@ -5648,63 +5807,90 @@ 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] "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa" +msgstr[1] "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Latauksen sijainti" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "Aseta {0}={1} relaatiolle \"{2}\"" + +#: ../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 +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 "Avaa valittu relaatio muokkaimeen" + +#: ../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 "" @@ -5714,15 +5900,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 " @@ -5730,5 +5916,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 " @@ -5736,20 +5922,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 "" @@ -5758,66 +5944,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 "Urheilu" + +#: ../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 "Siirrä valittuja jäseniä ylöspäin" #. 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 "Siirrä valittuja jäseniä alaspäin" #. 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 " @@ -5826,53 +6016,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 "Tee muutokset" -#: ../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 "Tee muutokset ja sulje tämä ikkuna" -#: ../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 "Peruuta muutokset ja sulje tämä ikkuna" -#: ../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 "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa" -#: ../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 "Lataa jäsenet" -#: ../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 "" @@ -5882,41 +6078,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 "" @@ -5956,19 +6145,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 "Toteuta muutokset" -#: ../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}''" @@ -5980,6 +6169,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 "" @@ -6160,7 +6348,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 "" @@ -6933,5 +7120,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 @@ -7168,6 +7355,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 "" @@ -7177,6 +7364,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 "" @@ -7439,13 +7626,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 "Muutoskokoelma" -#: ../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 "Avaa muutoskokoelman tiedot selaimessa" -#: ../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}" @@ -7546,6 +7733,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 "" @@ -7634,6 +7820,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] "" @@ -7647,6 +7833,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 " @@ -7701,5 +7887,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 " @@ -7707,5 +7893,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 "" @@ -7778,40 +7964,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 "Lähetä" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 msgid "Settings" msgstr "Asetukset" -#: ../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 "Uuden muutoskokoelman tagit" -#: ../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 "Lisättävät objektit:" -#: ../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 "Muokattavat objektit:" -#: ../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 "Poistettavat objektit:" -#: ../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:" @@ -7820,5 +8006,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:" @@ -7827,5 +8013,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:" @@ -7834,70 +8020,69 @@ 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 "Lähetä muutokset" -#: ../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 "Lähetä muutokset" -#: ../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 "Ole hyvä ja anna kommentti muutoskokoelmalle (vähintään 3 merkkiä)" -#: ../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 "Virheellinen kommentti" -#: ../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 "Ole hyvä ja lisää halutut koordinaatit ensin." + +#: ../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 "Peruuta lähetys ja jatka muokkausta" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 -msgid "Upload all changes in one request" -msgstr "Lähetä kaikki muutokset yhtenä pyyntönä" - -#: ../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 "Anna lyhyt kuvaus lähetettävistä muutoksista:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 msgid "Enter an upload comment (min. 3 characters)" msgstr "Anna muutoskokoelmalle kommentti (vähintään 3 merkkiä)" -#: ../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 "Avaa uusi muutoskokoelma" -#: ../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 "" "Avaa uusi muutoskokoelma ja käytä sitä seuraavan kerran lähetettäessä dataa" -#: ../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 "Käytä avonaista muutoskokoelmaa" -#: ../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 "Lähetä data avonaiseen muutoskokoelmaan" -#: ../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 "Sulje muutoskokoelma lähetyksen jälkeen" -#: ../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 "" "Valitse muutoskokoelman sulkemiseksi seuraavan datan lähetyksen jälkeen" -#: ../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}" @@ -7905,16 +8090,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 "Lataa lista avonaisista muutoskokoelmista palvelimelta" -#: ../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 "Sulje valittuna oleva avoin muutoskokoelma" -#: ../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}." @@ -7922,6 +8107,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 "" @@ -7930,5 +8115,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 "Lähetettävät objektit..." @@ -7958,111 +8143,56 @@ msgstr "Jatka lähetystä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "Lue GPX..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Ei aikaleimaa pisteelle {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 "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {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 "Luetaan {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Ei löytynyt aikaleimallisia kuvia." - -#: ../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 "Geo-merkityt kuvat" - -#: ../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 "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "aikavyöhyke-ero: " - -#: ../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] "kuva" -msgstr[1] "kuvat" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Tahdista kello" - -#: ../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 "JPEG-kuvat (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Kuva" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Tahdista aika GPS-yksikön kanssa" - -#: ../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 "Syötettyä aikaa ei voitu tulkita oikein." - -#: ../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 +#, fuzzy +msgid "Upload data in one request" +msgstr "Lähetä kaikki muutokset yhtenä pyyntönä" + +#: ../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} metriä" +msgstr[1] "{0} metriä" + +#: ../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 "Syötä käyttäjänimi" + +#: ../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 @@ -8070,30 +8200,30 @@ msgstr "gps-piste" -#: ../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 "Muokkaa viivanpiirtotyyliä" -#: ../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 "Käytä globaaleja asetuksia." -#: ../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 "Piirrä viivat pisteiden välillä tällä tasolla." -#: ../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 "Älä piirrä viivoja pisteiden välillä tällä tasolla." -#: ../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 "Viivanpiirtoasetukset" -#: ../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 @@ -8101,5 +8231,5 @@ msgstr "Muokkaa väriä" -#: ../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 @@ -8108,5 +8238,5 @@ msgstr "Oletusarvo" -#: ../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 @@ -8115,58 +8245,63 @@ msgstr "Valitse väri" -#: ../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 "Tuo äänitiedosto" -#: ../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 "Ääniaaltotiedostot (*.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 "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301 msgid "Import images" msgstr "Tuo kuvia" -#: ../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 "JPEG-kuvat (*.jpg)" + +#: ../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 "Nimi: {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 @@ -8174,5 +8309,5 @@ msgstr "Kuvaus: {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" @@ -8182,5 +8317,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 @@ -8188,22 +8323,17 @@ msgstr "Kuvaus" -#: ../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 "Pituus: " -#: ../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, " @@ -8212,5 +8342,5 @@ msgstr[1] "{0} reittiä, " -#: ../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" @@ -8219,24 +8349,24 @@ msgstr[1] "{0} reittipistettä" -#: ../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 "Muuta datatasoksi" -#: ../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:" +#: ../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 "" "Käsittelemättömän GPS-datan lähettämistä karttadatana pidetään " "haitallisena.
Jos haluat lähettää jälkiä, katso:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8246,41 +8376,40 @@ msgstr "Muutettu jäljestä {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 "Lataa data OSM-palvelimelta tämän jäljen varrelta" -#: ../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 "Lataa kaikki alueella:" -#: ../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} metriä" -#: ../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 "Yhden pyynnön enimmäisalue:" -#: ../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} neliökilometriä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" "This action will require {0} individual
download requests. Do you " "wish
to continue?" -msgstr "" -"Tämä vaatii {0} erillistä latauspyyntöä.
Jatketaanko?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 +msgstr "Tämä vaatii {0} erillistä latauspyyntöä.
Jatketaanko?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 msgid "No GPX track available in layer to associate audio with." msgstr "Tasolla ei ole yhtään GPX-jälkeä, johon liittää äänitiedosto." -#: ../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 " @@ -8288,5 +8417,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 " @@ -8294,23 +8423,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 "Datataso {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 "ladatun alueen ulkopuolella" -#: ../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." @@ -8319,5 +8448,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 "" @@ -8331,5 +8460,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 "" @@ -8342,11 +8471,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" @@ -8355,32 +8484,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} koostuu:" -#: ../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 "Muuta GPX-tasoksi" -#: ../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 "" @@ -8388,9 +8517,9 @@ #: ../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:" -msgstr "" -"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 "" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 @@ -8428,4 +8557,352 @@ msgstr[1] "{0} pistettä" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "GPX-tiedostot (*.gpx, *.gpx.gx)" + +#: ../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 "Virhe tulkittaessa {0}:aa" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Ei voitu lukea \"{0}\":aa" + +#: ../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 "" +"Ota kuva GPS-vastaanottimesi kellonäytöstä.
Valitse tähän ottamasi " +"kuva.
Syötä kuvassa näkyvä kellonaika ja valitse aikavyöhyke.
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Kuvausaika (kuvan EXIF-tiedoista):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "GPS:n aika (lue ylläolevasta kuvasta): " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [pp/kk/vvvv tt:mm:ss]" + +#: ../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 "Ei päivämäärää" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "Avaa toinen kuva" + +#: ../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 "" +"Ajan muotoa ei ymmärretty.\n" +"Ole hyvä ja syötä aika pyydetyssä muodossa" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "Virheellinen päivämäärä" + +#: ../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 "GPX-jälki: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Avaa toinen GPX-jälki" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +msgid "Timezone: " +msgstr "Aikavyöhyke: " + +#: ../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 "Kaikki kuvat" + +#: ../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 "Kohdista kuvia GPX-jälkeen" + +#: ../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 "Valitse GPX-jälki" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "GPX-jälkeä ei valittuna" + +#: ../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 "Virheellinen aikavyöhyke" + +#: ../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 "GPX-jälki ladattu" + +#: ../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 "" +"Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen jälki." + +#: ../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 "Hakee sijaintitietoja kuvien EXIF-tiedoista" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +msgid "Starting directory scan" +msgstr "Tutkii hakemistoa" + +#: ../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 "Luetaan kuvia..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "Luetaan {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 "Tutkii hakemistoa {0}" + +#: ../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 "Geo-merkityt kuvat" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "Sijoittele GPX-tiedoston mukaisesti" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "kuva" +msgstr[1] "kuvat" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "{0} kuvasta löytyi gps-sijaintitiedot." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +msgid "No image" +msgstr "Ei kuvaa" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "Ladataan {0}" + +#: ../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 "Virhe tiedostossa {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Näytä geo-merkityt kuvat" + +#: ../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 "Edellinen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Poista kuva tasosta" + +#: ../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 "Seuraava" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "Keskitä näkymä" + +#: ../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 "" +"\n" +"Korkeus: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8725,5 +9202,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 @@ -8917,6 +9394,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 "" "Piirrä suuntanuolet käyttäen etsintätaulukkoa kompleksilukulaskujen sijaan." @@ -8980,6 +9456,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 "Käytä antialisointia, joka antaa pehmeämmän ulkoasun." @@ -9048,19 +9523,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 "Ulkoasu ja käyttötuntuma" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Kieli" + +#: ../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 "Oletusarvo (automaattisesti päätetty)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Kieli" - -#: ../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 @@ -9321,6 +9796,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 "" @@ -9386,6 +9861,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 "" @@ -9398,9 +9873,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 "" "

Huomaathan, että seuraavan sivun listassa on myös näppäimiä, joita ei " @@ -9433,6 +9907,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 "" @@ -9525,5 +9999,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 "Lisää tietoja tästä ominaisuudesta" @@ -9610,5 +10084,5 @@ msgstr "Ladataan pisteet {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 @@ -9616,5 +10090,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9736,14 +10210,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 @@ -9771,24 +10244,31 @@ 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] "Ladataan pisteet {0}-{1}..." +msgstr[1] "Ladataan pisteet {0}-{1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9830,27 +10310,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 "" @@ -9858,66 +10338,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 msgid "Creating changeset..." msgstr "Muutoskokoelmaa luodaan..." -#: ../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 "Muutoskokoelma {0} avattiin onnistuneesti" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 msgid "Updating changeset..." msgstr "Muutoskokoelmaa päivitetään..." -#: ../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 "Muutoskokoelmaa {0} päivitetään..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 msgid "Closing changeset..." msgstr "Muutoskokoelmaa suljetaan..." -#: ../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 "Valmistellaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Lähetetään..." -#: ../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}." @@ -9952,5 +10432,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}''." @@ -9977,5 +10457,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}." @@ -9983,5 +10463,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}" @@ -9994,5 +10474,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}''." @@ -10050,7 +10530,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 "" @@ -10078,6 +10558,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 "" @@ -10143,46 +10623,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 "" @@ -10190,19 +10669,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 "Relaation jäsenen määrittely puutteellinen: ei voi olla ref=0" -#: ../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 "Virheellinen objekti (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 "" @@ -10212,8 +10691,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 "" @@ -10223,25 +10702,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 "" @@ -10249,5 +10728,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10256,5 +10735,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10262,5 +10741,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10269,13 +10748,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 "Valmistellaan OSM-karttatietoja..." -#: ../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 "" @@ -10328,4 +10807,10 @@ msgid "Contacting Server..." msgstr "Yhdistetään palvelimeen..." + +#: ../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 @@ -10363,44 +10848,44 @@ 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 "{0}% ({1}/{2}), {3} jäljellä. Lähetetään pistettä ''{4}'' (id: {5})" -#: ../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 "{0}% ({1}/{2}), {3} jäljellä. Lähetetään polkua ''{4}'' (id: {5})" -#: ../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 "" -"{0}% ({1}/{2}), {3} jäljellä. Lähetetään relaatiota ''{4}'' (id: {5})" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 +msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään relaatiota ''{4}'' (id: {5})" + +#: ../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 "Lähetetään dataa..." - -#: ../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 "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10441,17 +10926,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 "Poista {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Virhe poistettaessa liitännäistiedostoa: {0}" + +#: ../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}." @@ -10463,19 +10958,18 @@ msgstr "Tapahtui virhe liitännäisessä {0}" -#: ../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" @@ -10484,24 +10978,24 @@ 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 "Viimeisin liitännäisten päivitys oli yli {0} päivää sitten." -#: ../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 "Liitännäinen {0} tarvitsee vähintään version {1} JOSM:sta" -#: ../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." @@ -10509,26 +11003,26 @@ "{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on asennettu." -#: ../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 "Liitännäistä ei löytynyt: {0}." -#: ../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 "Liitännäistä {0} ei voitu ladata. Poistetaanko se asetuksista?" -#: ../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 "Poista liitännäinen käytöstä" -#: ../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 " @@ -10538,21 +11032,20 @@ "on oikeus korvata vanhat tiedostot." -#: ../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 "" "An unexpected exception occurred that may have come from the ''{0}'' plugin." -msgstr "" -"Tapahtui odottamaton poikkeus, joka ilmeni ehkä liitännäisessä ”{0}”." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318 +msgstr "Tapahtui odottamaton poikkeus, joka ilmeni ehkä liitännäisessä ”{0}”." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:319 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Liitännäisen sisältämien tietojen mukaan tekijä on {0}." -#: ../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." @@ -10560,9 +11053,9 @@ "Koita päivittää liitännäinen uusimpaan versioon ennen virheilmoituksen tekoa." -#: ../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 "Pitäisikö liitännäinen poistaa käytöstä?" -#: ../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 " @@ -10572,13 +11065,13 @@ "liitännäisen käytöstä." -#: ../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" @@ -10697,6 +11190,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 "" @@ -10734,6 +11227,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 "" @@ -10795,7 +11288,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 "" @@ -10807,7 +11299,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 "" @@ -10839,6 +11331,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 "" @@ -11096,5 +11588,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" @@ -11109,12 +11601,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 @@ -11122,450 +11612,142 @@ 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 +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 "kivihiili" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "kuva" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Vuokraamo" + +#: ../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 +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 "Näytä geo-merkityt kuvat" - -#: ../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 "Edellinen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Poista kuva tasosta" - -#: ../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 "Seuraava" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "Keskitä näkymä" - -#: ../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 "" -"\n" -"Korkeus: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/h" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "Hakee sijaintitietoja kuvien EXIF-tiedoista" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121 -msgid "Starting directory scan" -msgstr "Tutkii hakemistoa" - -#: ../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 "Luetaan kuvia..." - -#: ../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 "Tutkii hakemistoa {0}" - -#: ../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 "Sijoittele GPX-tiedoston mukaisesti" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} kuvasta löytyi gps-sijaintitiedot." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "Avaa kuvia AgPifoJ:llä..." - -#: ../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 "Lataa kuvat uutena tasona." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "GPX-tiedostot (*.gpx, *.gpx.gx)" - -#: ../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 "Virhe tulkittaessa {0}:aa" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Ei voitu lukea \"{0}\":aa" - -#: ../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 "" -"Ota kuva GPS-vastaanottimesi kellonäytöstä.
Valitse tähän ottamasi " -"kuva.
Syötä kuvassa näkyvä kellonaika ja valitse aikavyöhyke.
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Kuvausaika (kuvan EXIF-tiedoista):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "GPS:n aika (lue ylläolevasta kuvasta): " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [pp/kk/vvvv tt:mm:ss]" - -#: ../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 "Ei päivämäärää" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "Avaa toinen kuva" - -#: ../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 "" -"Ajan muotoa ei ymmärretty.\n" -"Ole hyvä ja syötä aika pyydetyssä muodossa" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "Virheellinen päivämäärä" - -#: ../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 "GPX-jälki: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Avaa toinen GPX-jälki" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -msgid "Timezone: " -msgstr "Aikavyöhyke: " - -#: ../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 "Kaikki kuvat" - -#: ../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 "Kohdista kuvia GPX-jälkeen" - -#: ../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 "Valitse GPX-jälki" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "GPX-jälkeä ei valittuna" - -#: ../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 "Virheellinen aikavyöhyke" - -#: ../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 "GPX-jälki ladattu" - -#: ../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 "" -"Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen jälki." - -#: ../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 "Ei kuvaa" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "Ladataan {0}" - -#: ../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 "Virhe tiedostossa {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11709,11 +11891,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 "" @@ -12019,12 +12200,4 @@ msgid "Export as PNG format (only raster images)" 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 @@ -12137,14 +12310,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 " @@ -12452,4 +12625,8 @@ msgstr "Avaa kuvat ImageWayPoint:lla" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Lataa kuvat uutena tasona." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -12493,18 +12670,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 "Poistetaan turhat pisteet..." -#: ../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 "Suoritetaan Douglas-Peucker-arviointi..." -#: ../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 "Poistetaan pisteiden kaksoiskappaleet..." -#: ../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" @@ -12553,7 +12730,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12563,5 +12740,5 @@ #. 50000 #. -#. +#. #. #. @@ -12571,5 +12748,5 @@ #. 50000 #. -#. +#. #. #. @@ -12578,5 +12755,5 @@ #. 50000 #. -#. +#. #. #. @@ -12586,5 +12763,5 @@ #. 50000 #. -#. +#. #. #. @@ -12662,6 +12839,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 "" "Suurin sallittu yhteyksien määrä kussakin luodussa polussa. Oletusarvo on " @@ -12686,7 +12862,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 "" "Douglas-Peucker-yksinkertaistamisen tarkkuus asteina.
Pienemmät arvot " @@ -12752,20 +12927,19 @@ msgstr "Kuvaa ei voitu ladata" -#: ../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 "Yhdistetään" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Yhdistetty" -#. 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 "Yhteys epäonnistui" @@ -12812,6 +12986,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 msgid "Connect to gpsd server and show current position in LiveGPS layer." -msgstr "" -"Kytkeydy gpsd-palvelimeen ja näytä nykyinen sijainti LiveGPS-tasossa." +msgstr "Kytkeydy gpsd-palvelimeen ja näytä nykyinen sijainti LiveGPS-tasossa." #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 @@ -12985,6 +13158,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 "" @@ -13067,9 +13239,10 @@ msgstr "Tuntematon tiedostopääte: {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 " @@ -13079,9 +13252,5 @@ "asetusten karttasivulta." -#: ../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 "" @@ -13360,6 +13529,5 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:47 msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!" -msgstr "" -"Surveyor-liitännäinen ei löytänyt tarvitsemaansa LiveGPS-liitännäistä!" +msgstr "Surveyor-liitännäinen ei löytänyt tarvitsemaansa LiveGPS-liitännäistä!" #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46 @@ -13457,17 +13625,17 @@ msgstr "Tagien esiasetuslähteet täytyy määritellä ensin asetuksissa." -#: ../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 "" @@ -13511,165 +13679,4 @@ msgid "Optional" msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "Yhdistä päällekkäiset alueet" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Joins areas that overlap each other" -msgstr "Yhdistää alueet jotka ovat osittain toistensa päällä" - -#: ../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 "" -"Valituilla poluilla on pisteitä ladatun alueen ulkopuolella.\n" -"Tämä voi mahdollisesti johtaa muiden polkujen käytössä olevien pisteiden " -"poistamiseen.\n" -"Oletko varma, että haluat jatkaa?" - -#: ../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 "Syötä arvot kaikille ristiriidoille." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Ratkaise ristiriitoja" - -#: ../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 "Yksinkertaista polku" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Poistaa turhat pisteet polusta." - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "Valitse vähintään yksi polku jonka haluat yksinkertaistaa." - -#: ../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] "Valinnassa on {0} polku. Haluatko varmasti yksinkertaistaa sen?" -msgstr[1] "" -"Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "Oletko varma?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13769,5 +13776,5 @@ msgstr "muut tarkistukset" -#: ../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}" @@ -13822,34 +13829,34 @@ msgstr "Ohita valitut virheet seuraavalla kerralla." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Koko ryhmä" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Yksittäiset elementit" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Ei mitään" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Ohitetaanko koko ryhmä vai yksittäiset elementit?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 msgid "Ignoring elements" msgstr "Ohitetaan elementit" -#: ../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 "" @@ -13898,18 +13905,18 @@ msgstr "Risteävät polut" -#: ../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 "Päällekkäiset pisteet" -#: ../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 "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa." -#: ../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 "" @@ -14146,11 +14153,10 @@ #: ../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 "" "Oikeinkirjoitustarkistimen ja ominaisuustarkistimen sääntötiedostot (URL-" -"osoite tai tiedostonimi) (lisätietoja " -"http://wiki.openstreetmap.org/index.php/User:JLS/speller )" +"osoite tai tiedostonimi) (lisätietoja http://wiki.openstreetmap.org/index." +"php/User:JLS/speller )" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 @@ -14193,6 +14199,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734 msgid "Check if map painting found data errors." -msgstr "" -"Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet." +msgstr "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 @@ -14296,5 +14301,5 @@ #. 50000 #. -#. +#. #. #. @@ -14302,5 +14307,5 @@ #. #. -#. +#. #. #. @@ -14310,5 +14315,5 @@ #. 50000 #. -#. +#. #. #. @@ -14317,5 +14322,5 @@ #. 50000 #. -#. +#. #. #. @@ -14324,5 +14329,5 @@ #. 50000 #. -#. +#. #. #. @@ -14331,5 +14336,5 @@ #. 50000 #. -#. +#. #. #. @@ -14338,5 +14343,5 @@ #. 50000 #. -#. +#. #. #. @@ -14345,9 +14350,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14392,5 +14397,5 @@ #. 50000 #. -#. +#. #. #. @@ -14527,14 +14532,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 " @@ -14543,14 +14548,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 "" @@ -14559,5 +14564,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 "" @@ -14569,13 +14574,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." @@ -14731,50 +14736,50 @@ "resoluutiota" -#: ../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 "Vaihda resoluutiota" -#: ../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 "Tallenna WMS-taso tiedostoon" -#: ../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 "Lataa WMS-taso tiedostosta" -#: ../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 "Virhe ladattaessa tiedostoa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -14850,5 +14855,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 "" @@ -14888,21 +14893,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 " @@ -14914,21 +14914,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 " @@ -14937,10 +14937,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 " @@ -14949,21 +14949,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 " @@ -14973,16 +14972,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 " @@ -14992,10 +14991,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 " @@ -15004,5 +15003,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 " @@ -15012,27 +15011,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 " @@ -15041,15 +15040,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 +msgid "Let other applications send commands to JOSM." +msgstr "" + +#. Plugin routes #: build/trans_plugins.java:55 -msgid "Let other applications send commands to JOSM." -msgstr "" - -#. Plugin routes -#: build/trans_plugins.java:57 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15058,10 +15057,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 " @@ -15070,15 +15069,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 " @@ -15088,17 +15087,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 " @@ -15107,5 +15099,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15114,10 +15106,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, ...)." @@ -16170,8 +16162,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16368,5 +16360,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16376,5 +16368,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16393,5 +16385,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16401,5 +16393,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16418,5 +16410,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16426,5 +16418,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16443,5 +16435,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16451,5 +16443,5 @@ #. 300000 #. -#. +#. #. #. @@ -16464,5 +16456,5 @@ #. 300000 #. -#. +#. #. #. @@ -16480,5 +16472,5 @@ #. 50000 #. -#. +#. #. #. @@ -16496,5 +16488,5 @@ #. 40000 #. -#. +#. #. #. @@ -16503,5 +16495,5 @@ #. 40000 #. -#. +#. #. #. @@ -16511,5 +16503,5 @@ #. 50000 #. -#. +#. #. #. @@ -16529,5 +16521,5 @@ #. 50000 #. -#. +#. #. #. @@ -16536,5 +16528,5 @@ #. 50000 #. -#. +#. #. #. @@ -16544,5 +16536,5 @@ #. 50000 #. -#. +#. #. #. @@ -16592,7 +16584,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17291,5 +17283,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17328,5 +17320,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17422,5 +17414,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17577,5 +17569,5 @@ #. 50000 #. -#. +#. #. #. @@ -18962,5 +18954,5 @@ #. 30000 #. -#. +#. #. #. @@ -18970,5 +18962,5 @@ #. 40000 #. -#. +#. #. #. @@ -18978,5 +18970,5 @@ #. 20000 #. -#. +#. #. #. @@ -18986,5 +18978,5 @@ #. 40000 #. -#. +#. #. #. @@ -19342,7 +19334,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19352,5 +19344,5 @@ #. 50000 #. -#. +#. #. #. @@ -19360,5 +19352,5 @@ #. 50000 #. -#. +#. #. #. @@ -19368,5 +19360,5 @@ #. 50000 #. -#. +#. #. #. @@ -19376,5 +19368,5 @@ #. 50000 #. -#. +#. #. #. @@ -19384,5 +19376,5 @@ #. 50000 #. -#. +#. #. #. @@ -19392,5 +19384,5 @@ #. 50000 #. -#. +#. #. #. @@ -19400,5 +19392,5 @@ #. 50000 #. -#. +#. #. #. @@ -19408,5 +19400,5 @@ #. 50000 #. -#. +#. #. #. @@ -19416,5 +19408,5 @@ #. 50000 #. -#. +#. #. #. @@ -19424,5 +19416,5 @@ #. 50000 #. -#. +#. #. #. @@ -19432,5 +19424,5 @@ #. 50000 #. -#. +#. #. #. @@ -19440,5 +19432,5 @@ #. 50000 #. -#. +#. #. #. @@ -19448,5 +19440,5 @@ #. 50000 #. -#. +#. #. #. @@ -19456,5 +19448,5 @@ #. 50000 #. -#. +#. #. #. @@ -19464,5 +19456,5 @@ #. 50000 #. -#. +#. #. #. @@ -19472,5 +19464,5 @@ #. 50000 #. -#. +#. #. #. @@ -19480,5 +19472,5 @@ #. 50000 #. -#. +#. #. #. @@ -19488,5 +19480,5 @@ #. 50000 #. -#. +#. #. #. @@ -19496,5 +19488,5 @@ #. 50000 #. -#. +#. #. #. @@ -19504,5 +19496,5 @@ #. 50000 #. -#. +#. #. #. @@ -19512,5 +19504,5 @@ #. 50000 #. -#. +#. #. #. @@ -19520,5 +19512,5 @@ #. 50000 #. -#. +#. #. #. @@ -19528,5 +19520,5 @@ #. 50000 #. -#. +#. #. #. @@ -19536,5 +19528,5 @@ #. 50000 #. -#. +#. #. #. @@ -19544,5 +19536,5 @@ #. 50000 #. -#. +#. #. #. @@ -19552,5 +19544,5 @@ #. 50000 #. -#. +#. #. #. @@ -19560,5 +19552,5 @@ #. 50000 #. -#. +#. #. #. @@ -19568,5 +19560,5 @@ #. 50000 #. -#. +#. #. #. @@ -19576,5 +19568,5 @@ #. 50000 #. -#. +#. #. #. @@ -19584,5 +19576,5 @@ #. 50000 #. -#. +#. #. #. @@ -19592,5 +19584,5 @@ #. 50000 #. -#. +#. #. #. @@ -19600,5 +19592,5 @@ #. 50000 #. -#. +#. #. #. @@ -19608,5 +19600,5 @@ #. 50000 #. -#. +#. #. #. @@ -19616,5 +19608,5 @@ #. 50000 #. -#. +#. #. #. @@ -19624,5 +19616,5 @@ #. 50000 #. -#. +#. #. #. @@ -19632,5 +19624,5 @@ #. 50000 #. -#. +#. #. #. @@ -19640,5 +19632,5 @@ #. 50000 #. -#. +#. #. #. @@ -19648,5 +19640,5 @@ #. 50000 #. -#. +#. #. #. @@ -19656,5 +19648,5 @@ #. 50000 #. -#. +#. #. #. @@ -19664,5 +19656,5 @@ #. 50000 #. -#. +#. #. #. @@ -19672,5 +19664,5 @@ #. 50000 #. -#. +#. #. #. @@ -19680,5 +19672,5 @@ #. 50000 #. -#. +#. #. #. @@ -19688,5 +19680,5 @@ #. 50000 #. -#. +#. #. #. @@ -19696,5 +19688,5 @@ #. 50000 #. -#. +#. #. #. @@ -19704,5 +19696,5 @@ #. 50000 #. -#. +#. #. #. @@ -19712,5 +19704,5 @@ #. 50000 #. -#. +#. #. #. @@ -21404,7 +21396,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21414,5 +21406,5 @@ #. 50000 #. -#. +#. #. #. @@ -21422,5 +21414,5 @@ #. 50000 #. -#. +#. #. #. @@ -21430,5 +21422,5 @@ #. 50000 #. -#. +#. #. #. @@ -21438,5 +21430,5 @@ #. 50000 #. -#. +#. #. #. @@ -21446,5 +21438,5 @@ #. 50000 #. -#. +#. #. #. @@ -21454,5 +21446,5 @@ #. 50000 #. -#. +#. #. #. @@ -21462,5 +21454,5 @@ #. 50000 #. -#. +#. #. #. @@ -22791,5 +22783,5 @@ #. 40000 #. -#. +#. #. #. @@ -22805,5 +22797,5 @@ #. 30000 #. -#. +#. #. #. @@ -22814,7 +22806,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22824,5 +22816,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22832,13 +22832,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22848,5 +22840,5 @@ #. 50000 #. -#. +#. #. #. @@ -22879,5 +22871,5 @@ #. 50000 #. -#. +#. #. #. @@ -22893,5 +22885,5 @@ #. 50000 #. -#. +#. #. #. @@ -22901,5 +22893,5 @@ #. 10000 #. -#. +#. #. #. @@ -22909,5 +22901,5 @@ #. 10000 #. -#. +#. #. #. @@ -22918,5 +22910,5 @@ #. 10000 #. -#. +#. #. #. @@ -22945,5 +22937,5 @@ #. 50000 #. -#. +#. #. #. @@ -23058,9 +23050,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 @@ -23068,5 +23060,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, @@ -23076,8 +23068,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 @@ -23091,5 +23083,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23097,5 +23089,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23144,6 +23136,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23223,5 +23215,5 @@ #. 40000 #. -#. +#. #. #. @@ -23231,5 +23223,5 @@ #. 10000 #. -#. +#. #. #. @@ -23238,5 +23230,5 @@ #. 50000 #. -#. +#. #. #. @@ -23246,5 +23238,5 @@ #. 50000 #. -#. +#. #. #. @@ -23253,5 +23245,5 @@ #. 50000 #. -#. +#. #. #. @@ -23260,5 +23252,5 @@ #. 50000 #. -#. +#. #. #. @@ -23267,5 +23259,5 @@ #. 50000 #. -#. +#. #. #. @@ -23274,5 +23266,5 @@ #. 50000 #. -#. +#. #. #. @@ -23281,5 +23273,5 @@ #. 40000 #. -#. +#. #. #. @@ -23288,5 +23280,5 @@ #. 50000 #. -#. +#. #. #. @@ -23295,5 +23287,5 @@ #. 50000 #. -#. +#. #. #. @@ -23302,5 +23294,5 @@ #. 50000 #. -#. +#. #. #. @@ -23309,5 +23301,5 @@ #. 50000 #. -#. +#. #. #. @@ -23316,5 +23308,5 @@ #. 50000 #. -#. +#. #. #. @@ -23323,5 +23315,5 @@ #. 50000 #. -#. +#. #. #. @@ -23331,5 +23323,5 @@ #. 50000 #. -#. +#. #. #. @@ -23338,5 +23330,5 @@ #. 50000 #. -#. +#. #. #. @@ -23347,5 +23339,5 @@ #. 50000 #. -#. +#. #. #. @@ -23357,11 +23349,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23370,7 +23362,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23381,5 +23373,5 @@ #. 50000 #. -#. +#. #. #. @@ -23390,5 +23382,5 @@ #. 50000 #. -#. +#. #. #. @@ -23399,5 +23391,5 @@ #. 50000 #. -#. +#. #. #. @@ -23408,5 +23400,5 @@ #. 50000 #. -#. +#. #. #. @@ -23417,5 +23409,5 @@ #. 50000 #. -#. +#. #. #. @@ -23426,5 +23418,5 @@ #. 40000 #. -#. +#. #. #. @@ -23436,5 +23428,5 @@ #. 50000 #. -#. +#. #. #. @@ -23445,5 +23437,5 @@ #. 50000 #. -#. +#. #. #. @@ -23468,5 +23460,5 @@ #. 10000 #. -#. +#. #. #. @@ -23475,5 +23467,5 @@ #. 50000 #. -#. +#. #. #. @@ -23482,5 +23474,5 @@ #. 50000 #. -#. +#. #. #. @@ -23496,5 +23488,5 @@ #. 20000 #. -#. +#. #. #. @@ -23508,5 +23500,5 @@ #. 30000 #. -#. +#. #. #. @@ -23515,5 +23507,5 @@ #. 50000 #. -#. +#. #. #. @@ -23522,5 +23514,5 @@ #. 50000 #. -#. +#. #. #. @@ -23529,5 +23521,5 @@ #. 50000 #. -#. +#. #. #. @@ -23536,5 +23528,5 @@ #. 50000 #. -#. +#. #. #. @@ -23543,5 +23535,5 @@ #. 50000 #. -#. +#. #. #. @@ -23550,5 +23542,5 @@ #. 50000 #. -#. +#. #. #. @@ -23557,5 +23549,5 @@ #. 50000 #. -#. +#. #. #. @@ -23564,5 +23556,5 @@ #. 50000 #. -#. +#. #. #. @@ -23571,5 +23563,5 @@ #. 50000 #. -#. +#. #. #. @@ -23578,5 +23570,5 @@ #. 50000 #. -#. +#. #. #. @@ -23585,5 +23577,5 @@ #. 50000 #. -#. +#. #. #. @@ -23592,5 +23584,5 @@ #. 50000 #. -#. +#. #. #. @@ -23599,5 +23591,5 @@ #. 50000 #. -#. +#. #. #. @@ -23606,5 +23598,5 @@ #. 50000 #. -#. +#. #. #. @@ -23775,7 +23767,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23789,5 +23781,5 @@ #. 40000 #. -#. +#. #. #. @@ -23797,7 +23789,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23807,5 +23799,5 @@ #. 50000 #. -#. +#. #. #. @@ -23815,5 +23807,5 @@ #. 50000 #. -#. +#. #. #. @@ -23823,5 +23815,5 @@ #. 50000 #. -#. +#. #. #. @@ -23831,5 +23823,5 @@ #. 50000 #. -#. +#. #. #. @@ -23845,5 +23837,5 @@ #. 10000 #. -#. +#. #. #. @@ -23853,5 +23845,5 @@ #. 50000 #. -#. +#. #. #. @@ -23861,5 +23853,5 @@ #. 50000 #. -#. +#. #. #. @@ -23869,5 +23861,5 @@ #. 50000 #. -#. +#. #. #. @@ -23877,5 +23869,5 @@ #. 50000 #. -#. +#. #. #. @@ -23885,5 +23877,5 @@ #. 50000 #. -#. +#. #. #. @@ -23893,5 +23885,5 @@ #. 50000 #. -#. +#. #. #. @@ -23910,5 +23902,5 @@ #. 50000 #. -#. +#. #. #. @@ -23917,5 +23909,5 @@ #. 50000 #. -#. +#. #. #. @@ -23929,5 +23921,5 @@ #. 50000 #. -#. +#. #. #. @@ -23941,5 +23933,5 @@ #. 50000 #. -#. +#. #. #. @@ -23948,5 +23940,5 @@ #. 50000 #. -#. +#. #. #. @@ -23960,5 +23952,5 @@ #. 50000 #. -#. +#. #. #. @@ -23973,5 +23965,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23986,5 +23978,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23998,5 +23990,5 @@ #. 50000 #. -#. +#. #. #. @@ -24010,5 +24002,5 @@ #. 50000 #. -#. +#. #. #. @@ -24017,5 +24009,5 @@ #. 50000 #. -#. +#. #. #. @@ -24024,5 +24016,5 @@ #. 50000 #. -#. +#. #. #. @@ -24036,5 +24028,5 @@ #. 50000 #. -#. +#. #. #. @@ -24044,5 +24036,5 @@ #. 50000 #. -#. +#. #. #. @@ -24051,5 +24043,5 @@ #. 50000 #. -#. +#. #. #. @@ -24058,5 +24050,5 @@ #. 50000 #. -#. +#. #. #. @@ -24065,5 +24057,5 @@ #. 50000 #. -#. +#. #. #. @@ -24073,5 +24065,5 @@ #. 50000 #. -#. +#. #. #. @@ -24082,5 +24074,5 @@ #. 50000 #. -#. +#. #. #. @@ -24090,7 +24082,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24100,5 +24092,5 @@ #. 50000 #. -#. +#. #. #. @@ -24108,5 +24100,5 @@ #. 50000 #. -#. +#. #. #. @@ -24116,5 +24108,5 @@ #. 50000 #. -#. +#. #. #. @@ -24125,5 +24117,5 @@ #. 50000 #. -#. +#. #. #. @@ -24133,5 +24125,5 @@ #. 50000 #. -#. +#. #. #. @@ -24141,5 +24133,5 @@ #. 50000 #. -#. +#. #. #. @@ -24149,5 +24141,5 @@ #. 50000 #. -#. +#. #. #. @@ -24157,5 +24149,5 @@ #. 50000 #. -#. +#. #. #. @@ -24165,5 +24157,5 @@ #. 50000 #. -#. +#. #. #. @@ -24173,5 +24165,5 @@ #. 50000 #. -#. +#. #. #. @@ -24181,5 +24173,5 @@ #. 50000 #. -#. +#. #. #. @@ -24189,5 +24181,5 @@ #. 50000 #. -#. +#. #. #. @@ -24210,7 +24202,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24220,5 +24212,5 @@ #. 50000 #. -#. +#. #. #. @@ -24227,5 +24219,5 @@ #. 50000 #. -#. +#. #. #. @@ -24235,5 +24227,5 @@ #. 50000 #. -#. +#. #. #. @@ -24242,5 +24234,5 @@ #. 50000 #. -#. +#. #. #. @@ -24250,5 +24242,5 @@ #. 50000 #. -#. +#. #. #. @@ -24258,5 +24250,5 @@ #. 50000 #. -#. +#. #. #. @@ -24272,5 +24264,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24281,5 +24273,5 @@ #. 50000 #. -#. +#. #. #. @@ -24298,5 +24290,5 @@ #. 50000 #. -#. +#. #. #. @@ -24306,5 +24298,5 @@ #. 50000 #. -#. +#. #. #. @@ -24317,5 +24309,5 @@ #. 50000 #. -#. +#. #. #. @@ -24333,5 +24325,5 @@ #. 50000 #. -#. +#. #. #. @@ -24340,5 +24332,5 @@ #. 50000 #. -#. +#. #. #. @@ -24347,5 +24339,5 @@ #. 50000 #. -#. +#. #. #. @@ -24354,7 +24346,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24365,5 +24357,5 @@ #. 50000 #. -#. +#. #. #. @@ -24378,5 +24370,5 @@ #. 50000 #. -#. +#. #. #. @@ -24390,5 +24382,5 @@ #. 50000 #. -#. +#. #. #. @@ -24398,5 +24390,5 @@ #. 50000 #. -#. +#. #. #. @@ -24410,5 +24402,5 @@ #. 50000 #. -#. +#. #. #. @@ -24422,5 +24414,5 @@ #. 50000 #. -#. +#. #. #. @@ -24429,7 +24421,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24439,5 +24431,5 @@ #. 50000 #. -#. +#. #. #. @@ -24447,5 +24439,5 @@ #. 50000 #. -#. +#. #. #. @@ -24455,5 +24447,5 @@ #. 50000 #. -#. +#. #. #. @@ -24463,5 +24455,5 @@ #. 50000 #. -#. +#. #. #. @@ -24477,7 +24469,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24492,5 +24484,5 @@ #. 30000 #. -#. +#. #. #. @@ -24505,5 +24497,5 @@ #. 30000 #. -#. +#. #. #. @@ -24518,5 +24510,5 @@ #. 30000 #. -#. +#. #. #. @@ -24531,5 +24523,5 @@ #. 30000 #. -#. +#. #. #. @@ -24544,5 +24536,5 @@ #. 30000 #. -#. +#. #. #. @@ -24557,7 +24549,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24567,5 +24559,5 @@ #. 50000 #. -#. +#. #. #. @@ -24574,5 +24566,5 @@ #. 50000 #. -#. +#. #. #. @@ -24582,5 +24574,5 @@ #. 50000 #. -#. +#. #. #. @@ -24590,5 +24582,5 @@ #. 50000 #. -#. +#. #. #. @@ -24598,5 +24590,5 @@ #. 50000 #. -#. +#. #. #. @@ -24606,5 +24598,5 @@ #. 50000 #. -#. +#. #. #. @@ -24614,5 +24606,5 @@ #. 50000 #. -#. +#. #. #. @@ -24622,5 +24614,5 @@ #. 50000 #. -#. +#. #. #. @@ -24630,5 +24622,5 @@ #. 50000 #. -#. +#. #. #. @@ -24638,5 +24630,5 @@ #. 50000 #. -#. +#. #. #. @@ -24646,5 +24638,5 @@ #. 50000 #. -#. +#. #. #. @@ -24654,5 +24646,5 @@ #. 50000 #. -#. +#. #. #. @@ -24662,5 +24654,5 @@ #. 50000 #. -#. +#. #. #. @@ -24680,5 +24672,5 @@ #. 50000 #. -#. +#. #. #. @@ -24693,5 +24685,5 @@ #. 50000 #. -#. +#. #. #. @@ -24704,7 +24696,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24714,5 +24706,5 @@ #. 50000 #. -#. +#. #. #. @@ -24722,5 +24714,5 @@ #. 50000 #. -#. +#. #. #. @@ -24730,5 +24722,5 @@ #. 50000 #. -#. +#. #. #. @@ -24738,5 +24730,5 @@ #. 50000 #. -#. +#. #. #. @@ -24746,5 +24738,5 @@ #. 50000 #. -#. +#. #. #. @@ -24754,5 +24746,5 @@ #. 50000 #. -#. +#. #. #. @@ -24762,5 +24754,5 @@ #. 50000 #. -#. +#. #. #. @@ -24770,5 +24762,5 @@ #. 50000 #. -#. +#. #. #. @@ -24778,5 +24770,5 @@ #. 50000 #. -#. +#. #. #. @@ -24786,5 +24778,5 @@ #. 50000 #. -#. +#. #. #. @@ -24794,5 +24786,5 @@ #. 50000 #. -#. +#. #. #. @@ -24802,5 +24794,5 @@ #. 50000 #. -#. +#. #. #. @@ -24810,5 +24802,5 @@ #. 50000 #. -#. +#. #. #. @@ -24818,5 +24810,5 @@ #. 50000 #. -#. +#. #. #. @@ -24837,5 +24829,5 @@ #. 50000 #. -#. +#. #. #. @@ -24849,7 +24841,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24859,5 +24851,5 @@ #. 50000 #. -#. +#. #. #. @@ -24867,5 +24859,5 @@ #. 50000 #. -#. +#. #. #. @@ -24875,5 +24867,5 @@ #. 50000 #. -#. +#. #. #. @@ -24883,5 +24875,5 @@ #. 50000 #. -#. +#. #. #. @@ -24891,5 +24883,5 @@ #. 50000 #. -#. +#. #. #. @@ -24899,5 +24891,5 @@ #. 50000 #. -#. +#. #. #. @@ -24907,5 +24899,5 @@ #. 50000 #. -#. +#. #. #. @@ -24922,5 +24914,5 @@ #. 50000 #. -#. +#. #. #. @@ -24930,5 +24922,5 @@ #. 50000 #. -#. +#. #. #. @@ -24938,5 +24930,5 @@ #. 50000 #. -#. +#. #. #. @@ -24946,5 +24938,5 @@ #. 50000 #. -#. +#. #. #. @@ -24954,5 +24946,5 @@ #. 50000 #. -#. +#. #. #. @@ -24962,5 +24954,5 @@ #. 50000 #. -#. +#. #. #. @@ -24970,5 +24962,5 @@ #. 50000 #. -#. +#. #. #. @@ -24978,5 +24970,5 @@ #. 50000 #. -#. +#. #. #. @@ -24986,5 +24978,5 @@ #. 50000 #. -#. +#. #. #. @@ -24994,5 +24986,5 @@ #. 50000 #. -#. +#. #. #. @@ -25002,5 +24994,5 @@ #. 50000 #. -#. +#. #. #. @@ -25010,5 +25002,5 @@ #. 50000 #. -#. +#. #. #. @@ -25027,5 +25019,5 @@ #. 50000 #. -#. +#. #. #. @@ -25035,5 +25027,5 @@ #. 50000 #. -#. +#. #. #. @@ -25042,5 +25034,5 @@ #. 50000 #. -#. +#. #. #. @@ -25050,5 +25042,5 @@ #. 50000 #. -#. +#. #. #. @@ -25058,5 +25050,5 @@ #. 50000 #. -#. +#. #. #. @@ -25066,5 +25058,5 @@ #. 50000 #. -#. +#. #. #. @@ -25073,5 +25065,5 @@ #. 50000 #. -#. +#. #. #. @@ -25081,5 +25073,5 @@ #. 50000 #. -#. +#. #. #. @@ -25089,5 +25081,5 @@ #. 50000 #. -#. +#. #. #. @@ -25097,5 +25089,5 @@ #. 50000 #. -#. +#. #. #. @@ -25105,5 +25097,5 @@ #. 50000 #. -#. +#. #. #. @@ -25112,5 +25104,5 @@ #. 50000 #. -#. +#. #. #. @@ -25119,5 +25111,5 @@ #. 50000 #. -#. +#. #. #. @@ -25126,5 +25118,5 @@ #. 50000 #. -#. +#. #. #. @@ -25133,5 +25125,5 @@ #. 50000 #. -#. +#. #. #. @@ -25140,5 +25132,5 @@ #. 50000 #. -#. +#. #. #. @@ -25147,5 +25139,5 @@ #. 50000 #. -#. +#. #. #. @@ -25154,5 +25146,5 @@ #. 50000 #. -#. +#. #. #. @@ -25161,5 +25153,5 @@ #. 50000 #. -#. +#. #. #. @@ -25168,5 +25160,5 @@ #. 50000 #. -#. +#. #. #. @@ -25175,5 +25167,5 @@ #. 50000 #. -#. +#. #. #. @@ -25182,5 +25174,5 @@ #. 50000 #. -#. +#. #. #. @@ -25189,5 +25181,5 @@ #. 50000 #. -#. +#. #. #. @@ -25196,5 +25188,5 @@ #. 50000 #. -#. +#. #. #. @@ -25204,5 +25196,5 @@ #. 50000 #. -#. +#. #. #. @@ -25212,5 +25204,5 @@ #. 50000 #. -#. +#. #. #. @@ -25220,5 +25212,5 @@ #. 50000 #. -#. +#. #. #. @@ -25228,5 +25220,5 @@ #. 50000 #. -#. +#. #. #. @@ -25236,5 +25228,5 @@ #. 50000 #. -#. +#. #. #. @@ -25244,5 +25236,5 @@ #. 50000 #. -#. +#. #. #. @@ -25252,5 +25244,5 @@ #. 50000 #. -#. +#. #. #. @@ -25260,5 +25252,5 @@ #. 50000 #. -#. +#. #. #. @@ -25268,5 +25260,5 @@ #. 50000 #. -#. +#. #. #. @@ -25277,5 +25269,5 @@ #. 50000 #. -#. +#. #. #. @@ -25285,5 +25277,5 @@ #. 50000 #. -#. +#. #. #. @@ -25293,5 +25285,5 @@ #. 50000 #. -#. +#. #. #. @@ -25301,5 +25293,5 @@ #. 50000 #. -#. +#. #. #. @@ -25309,5 +25301,5 @@ #. 50000 #. -#. +#. #. #. @@ -25317,5 +25309,5 @@ #. 50000 #. -#. +#. #. #. @@ -25325,5 +25317,5 @@ #. 50000 #. -#. +#. #. #. @@ -25333,5 +25325,5 @@ #. 50000 #. -#. +#. #. #. @@ -25341,5 +25333,5 @@ #. 50000 #. -#. +#. #. #. @@ -25349,5 +25341,5 @@ #. 50000 #. -#. +#. #. #. @@ -25357,5 +25349,5 @@ #. 50000 #. -#. +#. #. #. @@ -25365,5 +25357,5 @@ #. 50000 #. -#. +#. #. #. @@ -25373,5 +25365,5 @@ #. 50000 #. -#. +#. #. #. @@ -25381,5 +25373,5 @@ #. 50000 #. -#. +#. #. #. @@ -25389,5 +25381,5 @@ #. 50000 #. -#. +#. #. #. @@ -25397,5 +25389,5 @@ #. 50000 #. -#. +#. #. #. @@ -25405,5 +25397,5 @@ #. 50000 #. -#. +#. #. #. @@ -25413,5 +25405,5 @@ #. 50000 #. -#. +#. #. #. @@ -25421,5 +25413,5 @@ #. 50000 #. -#. +#. #. #. @@ -25428,5 +25420,5 @@ #. 50000 #. -#. +#. #. #. @@ -25458,5 +25450,5 @@ #. 50000 #. -#. +#. #. #. @@ -25466,5 +25458,5 @@ #. 50000 #. -#. +#. #. #. @@ -25474,7 +25466,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25489,5 +25481,5 @@ #. 50000 #. -#. +#. #. #. @@ -25497,5 +25489,5 @@ #. 50000 #. -#. +#. #. #. @@ -25505,5 +25497,5 @@ #. 50000 #. -#. +#. #. #. @@ -25513,5 +25505,5 @@ #. 50000 #. -#. +#. #. #. @@ -25521,5 +25513,5 @@ #. 50000 #. -#. +#. #. #. @@ -25529,5 +25521,5 @@ #. 50000 #. -#. +#. #. #. @@ -25537,5 +25529,5 @@ #. 50000 #. -#. +#. #. #. @@ -25551,7 +25543,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25561,5 +25553,5 @@ #. 50000 #. -#. +#. #. #. @@ -25569,5 +25561,5 @@ #. 50000 #. -#. +#. #. #. @@ -25577,5 +25569,5 @@ #. 50000 #. -#. +#. #. #. @@ -25585,5 +25577,5 @@ #. 50000 #. -#. +#. #. #. @@ -25593,5 +25585,5 @@ #. 50000 #. -#. +#. #. #. @@ -25601,5 +25593,5 @@ #. 50000 #. -#. +#. #. #. @@ -25609,5 +25601,5 @@ #. 50000 #. -#. +#. #. #. @@ -25617,5 +25609,5 @@ #. 50000 #. -#. +#. #. #. @@ -25625,5 +25617,5 @@ #. 50000 #. -#. +#. #. #. @@ -25633,5 +25625,5 @@ #. 50000 #. -#. +#. #. #. @@ -25641,5 +25633,5 @@ #. 50000 #. -#. +#. #. #. @@ -25649,5 +25641,5 @@ #. 50000 #. -#. +#. #. #. @@ -25657,5 +25649,5 @@ #. 50000 #. -#. +#. #. #. @@ -25665,5 +25657,5 @@ #. 50000 #. -#. +#. #. #. @@ -25673,5 +25665,5 @@ #. 50000 #. -#. +#. #. #. @@ -25681,5 +25673,5 @@ #. 50000 #. -#. +#. #. #. @@ -25689,5 +25681,5 @@ #. 50000 #. -#. +#. #. #. @@ -25697,5 +25689,5 @@ #. 50000 #. -#. +#. #. #. @@ -25705,5 +25697,5 @@ #. 50000 #. -#. +#. #. #. @@ -25713,5 +25705,5 @@ #. 50000 #. -#. +#. #. #. @@ -25721,5 +25713,5 @@ #. 50000 #. -#. +#. #. #. @@ -25729,5 +25721,5 @@ #. 50000 #. -#. +#. #. #. @@ -25737,5 +25729,5 @@ #. 50000 #. -#. +#. #. #. @@ -25745,5 +25737,5 @@ #. 50000 #. -#. +#. #. #. @@ -25753,5 +25745,5 @@ #. 50000 #. -#. +#. #. #. @@ -25761,5 +25753,5 @@ #. 50000 #. -#. +#. #. #. @@ -25769,5 +25761,5 @@ #. 50000 #. -#. +#. #. #. @@ -25777,5 +25769,5 @@ #. 50000 #. -#. +#. #. #. @@ -25785,5 +25777,5 @@ #. 50000 #. -#. +#. #. #. @@ -25793,5 +25785,5 @@ #. 50000 #. -#. +#. #. #. @@ -25801,5 +25793,5 @@ #. 50000 #. -#. +#. #. #. @@ -25809,5 +25801,5 @@ #. 50000 #. -#. +#. #. #. @@ -25817,5 +25809,5 @@ #. 50000 #. -#. +#. #. #. @@ -25825,5 +25817,5 @@ #. 50000 #. -#. +#. #. #. @@ -25833,5 +25825,5 @@ #. 50000 #. -#. +#. #. #. @@ -25841,5 +25833,5 @@ #. 50000 #. -#. +#. #. #. @@ -25849,5 +25841,5 @@ #. 50000 #. -#. +#. #. #. @@ -25857,5 +25849,5 @@ #. 50000 #. -#. +#. #. #. @@ -25865,5 +25857,5 @@ #. 50000 #. -#. +#. #. #. @@ -25873,5 +25865,5 @@ #. 50000 #. -#. +#. #. #. @@ -25881,5 +25873,5 @@ #. 50000 #. -#. +#. #. #. @@ -25889,5 +25881,5 @@ #. 50000 #. -#. +#. #. #. @@ -25923,7 +25915,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25933,5 +25925,5 @@ #. 50000 #. -#. +#. #. #. @@ -25941,5 +25933,5 @@ #. 50000 #. -#. +#. #. #. @@ -25949,5 +25941,5 @@ #. 50000 #. -#. +#. #. #. @@ -25957,5 +25949,5 @@ #. 50000 #. -#. +#. #. #. @@ -25965,5 +25957,5 @@ #. 50000 #. -#. +#. #. #. @@ -25973,5 +25965,5 @@ #. 50000 #. -#. +#. #. #. @@ -25981,5 +25973,5 @@ #. 50000 #. -#. +#. #. #. @@ -25996,5 +25988,5 @@ #. 50000 #. -#. +#. #. #. @@ -26004,5 +25996,5 @@ #. 50000 #. -#. +#. #. #. @@ -26012,5 +26004,5 @@ #. 50000 #. -#. +#. #. #. @@ -26020,5 +26012,5 @@ #. 50000 #. -#. +#. #. #. @@ -26028,5 +26020,5 @@ #. 50000 #. -#. +#. #. #. @@ -26036,5 +26028,5 @@ #. 50000 #. -#. +#. #. #. @@ -26045,5 +26037,5 @@ #. 50000 #. -#. +#. #. #. @@ -26053,5 +26045,5 @@ #. 50000 #. -#. +#. #. #. @@ -26061,5 +26053,5 @@ #. 40000 #. -#. +#. #. #. @@ -26069,5 +26061,5 @@ #. 50000 #. -#. +#. #. #. @@ -26076,5 +26068,5 @@ #. 40000 #. -#. +#. #. #. @@ -26083,5 +26075,5 @@ #. 40000 #. -#. +#. #. #. @@ -26099,7 +26091,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26109,5 +26101,5 @@ #. 50000 #. -#. +#. #. #. @@ -26117,5 +26109,5 @@ #. 50000 #. -#. +#. #. #. @@ -26125,5 +26117,5 @@ #. 50000 #. -#. +#. #. #. @@ -26133,5 +26125,5 @@ #. 50000 #. -#. +#. #. #. @@ -26141,5 +26133,5 @@ #. 50000 #. -#. +#. #. #. @@ -26149,5 +26141,5 @@ #. 50000 #. -#. +#. #. #. @@ -26157,5 +26149,5 @@ #. 50000 #. -#. +#. #. #. @@ -26165,5 +26157,5 @@ #. 50000 #. -#. +#. #. #. @@ -26173,5 +26165,5 @@ #. 50000 #. -#. +#. #. #. @@ -26190,5 +26182,5 @@ #. 50000 #. -#. +#. #. #. @@ -26202,5 +26194,5 @@ #. 50000 #. -#. +#. #. #. @@ -26214,5 +26206,5 @@ #. 50000 #. -#. +#. #. #. @@ -26222,5 +26214,5 @@ #. 50000 #. -#. +#. #. #. @@ -26234,5 +26226,5 @@ #. 50000 #. -#. +#. #. #. @@ -26246,5 +26238,5 @@ #. 50000 #. -#. +#. #. #. @@ -26258,6 +26250,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26267,5 +26259,5 @@ #. 50000 #. -#. +#. #. #. @@ -26279,5 +26271,5 @@ #. 50000 #. -#. +#. #. #. @@ -26291,5 +26283,5 @@ #. 50000 #. -#. +#. #. #. @@ -26303,5 +26295,5 @@ #. 50000 #. -#. +#. #. #. @@ -26315,5 +26307,5 @@ #. 50000 #. -#. +#. #. #. @@ -26327,5 +26319,5 @@ #. 50000 #. -#. +#. #. #. @@ -26335,7 +26327,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26345,5 +26337,5 @@ #. 50000 #. -#. +#. #. #. @@ -26353,5 +26345,5 @@ #. 50000 #. -#. +#. #. #. @@ -26361,5 +26353,5 @@ #. 50000 #. -#. +#. #. #. @@ -26369,5 +26361,5 @@ #. 50000 #. -#. +#. #. #. @@ -26384,5 +26376,5 @@ #. 50000 #. -#. +#. #. #. @@ -26395,5 +26387,5 @@ #. 50000 #. -#. +#. #. #. @@ -26407,5 +26399,5 @@ #. 50000 #. -#. +#. #. #. @@ -26419,5 +26411,5 @@ #. 50000 #. -#. +#. #. #. @@ -26431,5 +26423,5 @@ #. 50000 #. -#. +#. #. #. @@ -26440,5 +26432,5 @@ #. 50000 #. -#. +#. #. #. @@ -26448,5 +26440,5 @@ #. 50000 #. -#. +#. #. #. @@ -26456,5 +26448,5 @@ #. 50000 #. -#. +#. #. #. @@ -26464,5 +26456,5 @@ #. 50000 #. -#. +#. #. #. @@ -26472,5 +26464,5 @@ #. 50000 #. -#. +#. #. #. @@ -26487,5 +26479,5 @@ #. 50000 #. -#. +#. #. #. @@ -26499,5 +26491,5 @@ #. 50000 #. -#. +#. #. #. @@ -26511,5 +26503,5 @@ #. 50000 #. -#. +#. #. #. @@ -26523,5 +26515,5 @@ #. 50000 #. -#. +#. #. #. @@ -26535,5 +26527,5 @@ #. 50000 #. -#. +#. #. #. @@ -26547,5 +26539,5 @@ #. 50000 #. -#. +#. #. #. @@ -26554,7 +26546,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26564,5 +26556,5 @@ #. 50000 #. -#. +#. #. #. @@ -26572,5 +26564,5 @@ #. 50000 #. -#. +#. #. #. @@ -26580,5 +26572,5 @@ #. 50000 #. -#. +#. #. #. @@ -26588,5 +26580,5 @@ #. 50000 #. -#. +#. #. #. @@ -26596,5 +26588,5 @@ #. 50000 #. -#. +#. #. #. @@ -26604,5 +26596,5 @@ #. 50000 #. -#. +#. #. #. @@ -26612,5 +26604,5 @@ #. 50000 #. -#. +#. #. #. @@ -26627,7 +26619,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26637,5 +26629,5 @@ #. 50000 #. -#. +#. #. #. @@ -26645,5 +26637,5 @@ #. 50000 #. -#. +#. #. #. @@ -26653,5 +26645,5 @@ #. 50000 #. -#. +#. #. #. @@ -26661,5 +26653,5 @@ #. 50000 #. -#. +#. #. #. @@ -26675,5 +26667,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26722,5 +26714,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26730,5 +26722,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26738,5 +26730,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26746,5 +26738,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26754,5 +26746,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26762,5 +26754,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26770,5 +26762,5 @@ #. 50000 #. -#. +#. #. #. @@ -26778,5 +26770,5 @@ #. 50000 #. -#. +#. #. #. @@ -26786,5 +26778,5 @@ #. 50000 #. -#. +#. #. #. @@ -26794,5 +26786,5 @@ #. 50000 #. -#. +#. #. #. @@ -26802,5 +26794,5 @@ #. 50000 #. -#. +#. #. #. @@ -26810,5 +26802,5 @@ #. 50000 #. -#. +#. #. #. @@ -26828,5 +26820,5 @@ #. 50000 #. -#. +#. #. #. @@ -26835,5 +26827,5 @@ #. 50000 #. -#. +#. #. #. @@ -26842,5 +26834,5 @@ #. 50000 #. -#. +#. #. #. @@ -26849,5 +26841,5 @@ #. 40000 #. -#. +#. #. #. @@ -26856,5 +26848,5 @@ #. 40000 #. -#. +#. #. #. @@ -26863,5 +26855,5 @@ #. 40000 #. -#. +#. #. #. @@ -26956,5 +26948,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -26962,28 +26954,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 @@ -27098,5 +27090,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27109,5 +27101,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27132,6 +27124,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27140,6 +27132,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27154,6 +27146,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 @@ -27167,6 +27159,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 @@ -27186,6 +27178,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27209,6 +27201,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 @@ -27221,4 +27213,46 @@ msgstr "" +#~ msgid "Read GPX..." +#~ msgstr "Lue GPX..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Ei aikaleimaa pisteelle {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Ei löytynyt aikaleimallisia kuvia." + +#~ msgid "timezone difference: " +#~ msgstr "aikavyöhyke-ero: " + +#~ msgid "Sync clock" +#~ msgstr "Tahdista kello" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa." + +#~ msgid "Image" +#~ msgstr "Kuva" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Tahdista aika GPS-yksikön kanssa" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Syötettyä aikaa ei voitu tulkita oikein." + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Avaa kuvia AgPifoJ:llä..." + #~ msgid "Unknown version" #~ msgstr "Tuntematon versio" @@ -27257,7 +27291,4 @@ #~ msgstr "Tuntematon tiedostopääte." -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Ole hyvä ja lisää halutut koordinaatit ensin." - #~ msgid "Error parsing server response." #~ msgstr "Virhe palvelimen vastauksen käsittelyssä." @@ -27278,8 +27309,4 @@ #~ msgstr "Muokkaa" -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Poista {1} {0}" - #~ msgid "Move" #~ msgstr "Siirrä" @@ -27303,5 +27330,4 @@ #~ msgstr "EPSG:4326" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Virhe ladattaessa sivua {0}" @@ -27338,9 +27364,9 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti yhdistää " -#~ "ne?" +#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti " +#~ "yhdistää ne?" #~ msgid "Only one node selected" @@ -27351,9 +27377,9 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" -#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti yhdistää " -#~ "ne?" +#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti " +#~ "yhdistää ne?" #~ msgid "All the ways were empty" @@ -27368,6 +27394,6 @@ #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "" -#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi ja " -#~ "siirtääksesi näkymää." +#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi " +#~ "ja siirtääksesi näkymää." #~ msgid "Click Reload to refresh list" @@ -27381,8 +27407,7 @@ #~ "setting the config option 'pluginmanager.warntime'.)" #~ msgstr "" -#~ "(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus " -#~ "tulee,
asettamalla ”plginmanager.warntime”-asetuksen)" - -#, java-format +#~ "(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus tulee," +#~ "
asettamalla ”plginmanager.warntime”-asetuksen)" + #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}." @@ -27392,6 +27417,6 @@ #~ "some time." #~ msgstr "" -#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai yritä " -#~ "myöhemmin uudestaan." +#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai " +#~ "yritä myöhemmin uudestaan." #~ msgid "Include your steps to get to the error (as detailed as possible)!" @@ -27400,5 +27425,4 @@ #~ "virhetilanteeseen." -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Käytä esivalintaa ”{0}”" @@ -27411,6 +27435,6 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" #~ "Palauta kaikkien valittujen objektien tila historialistassa valittuun " @@ -27432,8 +27456,4 @@ #~ msgstr "Lisää uusi tagien esivalintalähde listaan." -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Virhe poistettaessa liitännäistiedostoa: {0}" - #~ msgid "Plugin already exists" #~ msgstr "Liitännäinen on jo olemassa" @@ -27442,5 +27462,4 @@ #~ msgstr "Lisää joko site-josm.xml tai Wiki-sivusto." -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}" @@ -27496,5 +27515,4 @@ #~ msgstr "pyöräkartta" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27502,11 +27520,10 @@ #~ msgstr[1] "{0} objektilla on ristiriitoja:" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\"" #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" #~ "Päivitä JOSM ja liitännäiset uusimpiin versioihin ennen virheilmoituksen " @@ -27531,12 +27548,11 @@ #~ msgstr "Lähetä OSM-palvelimelle..." -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" #~ "Liitännäinen {0} vaikuttaa rikkinäiseltä, tai sitä ei voitu ladata " #~ "automaattisesti." -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27552,5 +27568,4 @@ #~ "Älä lähetä mitään dataa palvelimelle tämän viestin jälkeen." -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -27567,9 +27582,7 @@ #~ msgstr "Metacarta Map Rectifier:in kuvatunnus (id)" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Muokkaajat: {0}" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Ristiriidat: {0}" @@ -27579,6 +27592,6 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" #~ "Sisäinen virhe: tallennuskelpoisuuden tarkistus ei onnistu ilman avoimia " @@ -27593,10 +27606,11 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" -#~ "VAROITUS: Salasana on tallennettu asetustiedostoon ilman minkäänlaista " -#~ "salausta.
Salasana lähetetään salaamattomana palvelimelle URL-" -#~ "osoitteessa.
Älä käytä arvokasta salasanaa." +#~ "VAROITUS: Salasana on tallennettu asetustiedostoon ilman " +#~ "minkäänlaista salausta.
Salasana lähetetään salaamattomana " +#~ "palvelimelle URL-osoitteessa.
Älä käytä arvokasta salasanaa." #~ msgid "Portcullis" @@ -27606,5 +27620,4 @@ #~ msgstr "Tagit (tyhjä arvo poistaa tagin)" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Omien asetusten hakemistoa {0} ei voi avata." @@ -27618,9 +27631,7 @@ #~ "lähettämistä." -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Tee virheilmoitus osoitteessa {0}" -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Ohitetaan polku, jonka jotain pistettä ei ole olemassa: {0}\n" @@ -27635,5 +27646,4 @@ #~ msgstr "Siirrä ylöspäin" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Relaatioeditori: {0}" @@ -27656,5 +27666,6 @@ #~ msgid "Please select one or more closed ways of at least four nodes." #~ msgstr "" -#~ "Valitse yksi tai useampi suljettu polku, joissa on vähintään neljä pistettä." +#~ "Valitse yksi tai useampi suljettu polku, joissa on vähintään neljä " +#~ "pistettä." #~ msgid "" @@ -27668,16 +27679,17 @@ #~ msgstr "Julkinen" -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " #~ "continue?" #~ msgstr "" -#~ "Tämä toiminto vaatii {0} erillistä latauspyyntyöä. Oletko varma, että haluat " -#~ "jatkaa?" +#~ "Tämä toiminto vaatii {0} erillistä latauspyyntyöä. Oletko varma, että " +#~ "haluat jatkaa?" #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" -#~ "Ei päivitettäviä karttatietoja. Et ole ladannut etkä avannut karttatietoja." +#~ "Ei päivitettäviä karttatietoja. Et ole ladannut etkä avannut " +#~ "karttatietoja." #~ msgid "" @@ -27691,8 +27703,8 @@ #~ msgstr "Päivitys epäonnistui" -#, java-format #~ msgid "" #~ "Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -#~ "changeset will automatically be closed by the server after a timeout." +#~ "changeset will automatically be closed by the server after a timeout." #~ msgstr "" #~ "Muutoskokoelman ''{0}'' sulkeminen epäonnistui OSM-palvelimella " Index: /applications/editors/josm/i18n/po/fr.po =================================================================== --- /applications/editors/josm/i18n/po/fr.po (revision 18974) +++ /applications/editors/josm/i18n/po/fr.po (revision 18975) @@ -6,6 +6,6 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 16:20+0100\n" -"PO-Revision-Date: 2009-11-29 16:45+0000\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-12-03 18:07+0000\n" "Last-Translator: François Blondel \n" "Language-Team: Fr <>\n" @@ -14,5 +14,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:05+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:16+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Language: French\n" @@ -28,6 +28,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 @@ -44,7 +44,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 @@ -60,19 +60,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 @@ -85,9 +84,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" @@ -107,6 +106,5 @@ msgid "Could not read file ''{0}''.
Error is:
{1}" msgstr "" -"Impossible de lire le fichier « {0} ».
L’erreur est : " -"
{1}" +"Impossible de lire le fichier « {0} ».
L’erreur est :
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -117,5 +115,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 +136,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 +154,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 +182,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 "Erreur" @@ -268,5 +262,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 "Greffons" @@ -316,4 +310,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 @@ -321,8 +317,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 @@ -332,29 +328,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 @@ -384,6 +378,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 "" "Il n’y a pas de calque vers lequel
\"{0}\"
le calque source " @@ -437,14 +431,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 "Latitude" #: ../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 "Longitude" @@ -452,17 +446,17 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 msgid "Please enter a valid latitude in the range -90..90" -msgstr "" +msgstr "Veuillez entrer une latitude valide entre -90° et 90°" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 msgid "Please enter a latitude in the range -90..90" -msgstr "" +msgstr "Veuillez entrer une latitude entre -90° et 90°" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 msgid "Please enter a valid longitude in the range -180..180" -msgstr "" +msgstr "Veuillez entrer une longitude valide entre -180° et 180°" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 msgid "Please enter a longitude in the range -180..180" -msgstr "" +msgstr "Veuillez entrer une longitude entre -180° et 180°" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 @@ -470,10 +464,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 @@ -485,9 +479,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 msgid "Close the dialog and create a new node" -msgstr "" +msgstr "Fermer la boîte de dialogue et créer un nouveau nœud." #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 msgid "Close the dialog, don't create a new node" -msgstr "" +msgstr "Fermer la boîte de dialogue sans créer de nouveau nœud." #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 @@ -504,19 +498,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 @@ -525,9 +522,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 @@ -543,7 +537,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 @@ -555,11 +549,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" @@ -647,5 +641,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}" @@ -700,10 +694,10 @@ "une seule chaîne de nœuds)" -#: ../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 "Fusionner {0} voies" -#: ../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 "Veuillez sélectionner au moins deux chemins à fusionner." @@ -722,19 +716,19 @@ msgstr "Veuillez sélectionner quelque chose à copier." +#: ../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 "Créer un cercle" -#: ../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 "Créer un cercle à partir de trois nœuds sélectionnés." -#: ../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 "Ces nœuds ne sont pas en cercle. Abandon." -#: ../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 " @@ -747,9 +741,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 @@ -790,6 +784,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." -msgstr "" -"Distribue les nœuds sélectionnés à égale distance le long d'une ligne." +msgstr "Distribue les nœuds sélectionnés à égale distance le long d'une ligne." #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32 @@ -824,21 +817,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" @@ -846,6 +843,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 @@ -874,5 +871,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 "Dupliquer" @@ -929,8 +926,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 @@ -938,5 +933,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 @@ -949,8 +944,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 @@ -969,8 +964,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 @@ -993,13 +988,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 @@ -1037,6 +1033,108 @@ #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17 msgid "Display object information about OSM nodes, ways, or relations." -msgstr "" -"Affiche les informations à propos des nœuds, chemins ou relations OSM." +msgstr "Affiche les informations à propos des nœuds, chemins ou relations OSM." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "Joindre zones superposées" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Joins areas that overlap each other" +msgstr "Joint les zones qui se superposent l'une l'autre" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +msgid "Only up to two areas can be joined at the moment." +msgstr "Seul un maximum de deux zones peuvent être jointes pour le moment." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#, java-format +msgid "\"{0}\" is not closed and therefore can't be joined." +msgstr "\"{0}\" n'est pas fermé et ne peut donc être joint." + +#: ../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 "" +"Le(s) chemin(s) sélectionné(s) contien(nen)t des nœuds en dehors de la zone " +"téléchargée.\n" +"Certains nœuds utilisés en dehors de la zone pourraient être supprimés.\n" +"Voulez-vous vraiment continuer ?" + +#: ../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 "Veuillez abandonner si vous n'êtes pas sûr(e)" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 +msgid "Please select at least one closed way the should be joined." +msgstr "Veuillez sélectionner au moins un chemin clos devant être fusionné." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +msgid "No intersection found. Nothing was changed." +msgstr "Pas d’intersection trouvée. Rien n’a été modifié." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +msgid "Added node on all intersections" +msgstr "Noeuds ajoutés sur toutes les intersections" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgid "Delete Ways that are not part of an inner multipolygon" +msgstr "" +"Supprimer les chemins qui ne font pas partie d'un multipolygone intérieur" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +msgid "Fix relations" +msgstr "Corriger les relations" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgid "Joined self-overlapping area" +msgstr "Ai fusionné une aire superposée sur elle même" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +msgid "Joined overlapping areas" +msgstr "Ai fusionné des aires superposées" + +#: ../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 "" +"Certains chemins faisaient partie de relations qui ont été modifiées. " +"Veuillez vérifier qu'aucune erreur n'a été introduite." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +msgid "Enter values for all conflicts." +msgstr "Entrer des valeurs pour tous les conflits." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Résoudre les conflits" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +msgid "Fix tag conflicts" +msgstr "Corriger les conflits d’attribut" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +msgid "Removed Element from Relations" +msgstr "Élément supprimé des relations" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +msgid "Join Areas: Remove Short Ways" +msgstr "Aires jointes: enlever les voies courtes" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +msgid "Closed Way" +msgstr "Chemin fermé" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgid "Remove tags from inner ways" +msgstr "Supprime les attributs des chemins internes" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +msgid "Join Areas Function" +msgstr "Fonction de jointure des zones" #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 @@ -1057,4 +1155,47 @@ msgstr "Pas de raccourci" +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Jump To Position" +msgstr "Aller à la position" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Opens a dialog that allows to jump to a specific location" +msgstr "" +"Ouvre une boite de dialogue permettant de se rendre à une position spécifique" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57 +msgid "Enter Lat/Lon to jump to position." +msgstr "Entrez la Lat./Long. pour vous rendre à la position." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 +msgid "You can also paste an URL from www.openstreetmap.org" +msgstr "Vous pouvez aussi coller une URL de www.openstreetmap.org" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 +msgid "Zoom (in metres)" +msgstr "Zoom (en mètres)" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 +msgid "URL" +msgstr "URL" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 +msgid "Jump there" +msgstr "Aller ici" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 +msgid "Jump to Position" +msgstr "Aller à la position" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Could not parse Latitude, Longitude or Zoom. Please check." +msgstr "" +"Impossible d'analyser la Latitude, Longitude ou le Zoom. Veuillez vérifier." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Unable to parse Lon/Lat" +msgstr "Analyse syntaxique de la Lat./Lon. impossible" + #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" @@ -1065,26 +1206,26 @@ msgstr "Fusionne le calque courant avec un autre calque" +#: ../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 "Fusionner les nœuds" -#: ../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 "Fusionner les nœuds sur le plus ancien" -#: ../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 "Veuillez sélectionner au moins deux nœuds à fusionner." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126 msgid "Abort Merging" msgstr "Annuler la fusion" -#: ../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 "Clicker pour fusionner les noeuds" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135 #, java-format msgid "" @@ -1094,5 +1235,5 @@ "qui est encore utilisé." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231 #, java-format msgid "Merge {0} nodes" @@ -1281,7 +1422,7 @@ msgstr "" "Vous utilisez la projection EPSG:4326 qui pourrait conduire
à " -"d'indésirables résultats en faisant des alignements " -"rectangulaires.
Changez votre projection pour supprimer cet " -"avertissement.
Voulez-vous continuer ?" +"d'indésirables résultats en faisant des alignements rectangulaires." +"
Changez votre projection pour supprimer cet avertissement.
Voulez-" +"vous continuer ?" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 @@ -1476,6 +1617,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 "" "Affiche le rapport de statut avec des informations utiles pouvant être " @@ -1497,9 +1637,43 @@ #: ../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 "Fermer" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Simplifier le chemin" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Supprimer les nœuds non nécessaires du chemin" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "Veuillez sélectionner au moins un chemin à simplifier." + +#: ../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] "" +"La sélection contient {0} chemin. Êtes-vous sûr de vouloir le simplifier ?" +msgstr[1] "" +"La sélection contient {0} chemins. Êtes-vous sûr de vouloir les simplifier ?" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 +msgid "Are you sure?" +msgstr "Êtes-vous sur ?" + +#: ../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] "Simplifier le chemin (supprimer {0} nœud)" +msgstr[1] "Simplifier le chemin (supprimer {0} nœuds)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1514,6 +1688,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:91 msgid "The current selection cannot be used for splitting." -msgstr "" -"La sélection actuelle ne peut pas être utilisée pour couper un chemin." +msgstr "La sélection actuelle ne peut pas être utilisée pour couper un chemin." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147 @@ -1635,6 +1808,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 "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou" @@ -1648,6 +1820,5 @@ msgid "" "* One way and one or more of its nodes that are used by more than one way." -msgstr "" -"* Un chemin et un ou plus de ses nœuds utilisés par plus d’un chemin." +msgstr "* Un chemin et un ou plus de ses nœuds utilisés par plus d’un chemin." #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 @@ -1716,15 +1887,15 @@ #. 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 "Télécharger les données." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "No current dataset found" msgstr "Pas de jeu de données courant trouvé" -#: ../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" @@ -1733,9 +1904,9 @@ "courant" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Update selection" msgstr "Mettre à jour la sélection" -#: ../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)" @@ -1744,26 +1915,26 @@ "les données)." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 msgid "Update Selection" msgstr "Mettre à jour la sélection" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 msgid "There are no selected objects to update." msgstr "Il n'y a pas d'objets sélectionné à mettre à jour." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "Selection empty" msgstr "La sélection est vide" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 msgid "Update objects" msgstr "Mettre à jour les objets" -#: ../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 "Envoyer les données" -#: ../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 "" @@ -1771,5 +1942,5 @@ "OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 #, java-format msgid "" @@ -1780,35 +1951,35 @@ "les résoudre d'abord." -#: ../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 "Aucun changement à envoyer." -#: ../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 "Rien à envoyer. Obtenez d’abord des données." -#: ../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 "Synchroniser seulement les noeuds {0}" -#: ../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 "Synchroniser seulement les chemins {0}" -#: ../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 "Synchroniser seulement les relations {0}" -#: ../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 "Synchroniser tout le jeu de données" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1816,9 +1987,8 @@ "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.
" +"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 "" "L’envoi a échoué car le serveur a une version plus " @@ -1826,31 +1996,30 @@ "de {0} d’id {1},
le serveur a la " "version {2}, votre version est la {3}.

Cliquez {4} " -"pour synchroniser uniquement la primitive en conflit.
Cliquez " -"{5} pour synchroniser le jeu de données local entièrement " -"avec le serveur.
Cliquez {6} pour annuler et continuer " -"l’édition.
" - -#: ../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 +"pour synchroniser uniquement la primitive en conflit.
Cliquez {5}" +" pour synchroniser le jeu de données local entièrement avec le " +"serveur.
Cliquez {6} pour annuler et continuer l’édition." +"
" + +#: ../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 "Conflits détectés" -#: ../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.
" +"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 "" "L’envoi a échoué car le serveur aune version plus " -"récente de l’un de vos nœuds, chemins ou relations.

Cliquez " -"{0} pour synchroniser l’ensemble de votre jeu de données " -"local.
Cliquez {1} pour annuler et continuer " -"l’édition.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 +"récente de l’un de vos nœuds, chemins ou relations.

Cliquez " +"{0} pour synchroniser l’ensemble de votre jeu de données local." +"
Cliquez {1} pour annuler et continuer l’édition.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1863,22 +2032,22 @@ "nouveau avec un nouveau changeset ou avec un changeset existant." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 msgid "Changeset closed" msgstr "Ensemble de changement fermé" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 msgid "Prepare conflict resolution" msgstr "Prépare la résolution de conflits" -#: ../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 "Cliquer pour télécharger tous les ways parents du nœud {0}" -#: ../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 "Cliquer pour annuler et reprendre l'édition de la carte" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 #, java-format msgid "" @@ -1889,10 +2058,10 @@ 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 "Le nœud est encore utilisé" -#: ../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" @@ -1901,5 +2070,5 @@ "attendu." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 msgid "Updating primitive" msgstr "Mise à jour des primitives" @@ -1911,6 +2080,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 "" @@ -1919,39 +2088,38 @@ 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 "Envoi de {0} objets…" -#: ../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 "Envoyer la sélection" -#: ../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 "" "Téléchargé tous les changement de la séléction courante vers le serveur OSM." -#: ../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 "" @@ -2119,13 +2287,13 @@ "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 "" "Il y a {0} primitives dans votre jeu de données local qui
semblent " "supprimées du serveur. Si vous tentez ultérieurement de les supprimer " -"ou
de les mettre à jour, le serveur retournera probablement " -"un
conflit.

Cliquez sur {1} pour vérifier l’état " -"de ces primitives
sur le serveur.
Cliquez sur {2} " -"pour ignorer.
" +"ou
de les mettre à jour, le serveur retournera probablement un
conflit." +"

Cliquez sur {1} pour vérifier l’état de ces " +"primitives
sur le serveur.
Cliquez sur {2} pour " +"ignorer.
" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183 @@ -2195,38 +2363,38 @@ msgstr "sélectionné" -#: ../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 "Impossible d'ajouter un nœud en dehors du monde" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Ajouter un nœud" -#: ../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 "Ajouter un nœud au chemin." -#: ../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 "Connecter le chemin existant au nœud" -#: ../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 "Ajouter un nœud à un chemin existant." -#: ../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 "Ajouter un nœud sur le chemin et le connecter" -#: ../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 "Créer un nouveau nœud." -#: ../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 "Sélectionner le nœud sous le curseur." -#: ../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." @@ -2235,14 +2403,14 @@ msgstr[1] "Ajouter un nouveau nœud aux {0} chemins." -#: ../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 "Commencer un nouveau chemin à partir du dernier nœud." -#: ../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 "Continuer le chemin à partir du dernier nœud." -#: ../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 "Terminer le tracé." @@ -2281,6 +2449,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 "" "Déplacer le curseur de lecture et le relacher à côté de la trace pour lire " @@ -2390,5 +2558,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." @@ -2476,13 +2644,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - tous les objets modifiés par l'utilisateur" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" -msgstr "" -"id :... - objet avec l'ID indiqué (0 pour les nouveaux objets)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +msgstr "id :... - objet avec l'ID indiqué (0 pour les nouveaux objets)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objet avec le nombre de nœuds spécifié" -#: ../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-" @@ -2490,21 +2662,21 @@ 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 "modified - tous les objets modifiés" -#: ../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 "selected - tous les objets sélectionnés" -#: ../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 "incomplete - tous les objets incomplets" -#: ../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 "untagged - tous les objets non étiquetés" -#: ../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" @@ -2513,5 +2685,5 @@ "l'expression" -#: ../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" @@ -2520,18 +2692,18 @@ "l'expression" -#: ../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 "Utilisez | ou OR pour combiner avec le OU logique" -#: ../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 "" "Utilisez \" pour citer des opérateurs (i.e. si la clé contient :)" -#: ../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 "Utilisez ( et ) pour grouper des expressions" -#: ../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 @@ -2541,33 +2713,33 @@ msgstr "Filtrez" -#: ../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 "Chercher" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Submit filter" msgstr "appliquer le filtre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Start Search" msgstr "Commencer la recherche" -#: ../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 "Aucun résultat trouvé pour \"{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 "Rien n’a été ajouté à la sélection en recherchant \"{0}\"" -#: ../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 "Rien n’a été enlevé à la sélection en recherchant \"{0}\"" -#: ../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}''" @@ -2575,22 +2747,22 @@ "Aucun résultat lors de la recherche dans la sélection en cherchant ''{0}''" -#: ../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} résultats trouvés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2604,5 +2776,5 @@ "{2}" -#: ../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 "" @@ -2610,10 +2782,10 @@ "d'utilisation : clé=valeur" -#: ../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 "Erreur de syntaxe du motif : le motif {0} dans {1} est illégal !" -#: ../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" @@ -2622,26 +2794,26 @@ "relation" -#: ../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 "Jeton inattendu : {0}" -#: ../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 "Arguments manquants pour le OU" -#: ../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 "Arguments manquants pour le -" -#: ../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 "Les parenthèses doivent être fermées." -#: ../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 "" @@ -2650,9 +2822,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 "Erreur de nombre de paramètre pour une opération sur des nœuds." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 #, java-format msgid "" @@ -2664,5 +2836,5 @@ "10-20" -#: ../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." @@ -2704,6 +2876,6 @@ "{0}, max is {1}" msgstr "" -"Le nombre actuel de changements dépasse le maximum autorisé. Nombre courant " -": {0}, maximum : {1}" +"Le nombre actuel de changements dépasse le maximum autorisé. Nombre " +"courant : {0}, maximum : {1}" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 @@ -2713,8 +2885,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" +#, fuzzy, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" msgstr "" "Attention : troncage automatique de la valeur du champ \"{0}\" sur la " @@ -2722,7 +2893,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2865,5 +3036,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 "Double conflit" @@ -2882,5 +3053,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 "" @@ -2901,19 +3073,19 @@ msgstr "impossible de résoudre un conflit non arbitré" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 +#: ../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 "Le paramètre ''{0}'' ne doit pas être vide." -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61 +#: ../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:107 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 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" @@ -2922,5 +3094,5 @@ msgstr[1] "Supprimer {0} objets" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2929,5 +3101,5 @@ msgstr[1] "Supprimer {0} nœuds" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2936,5 +3108,5 @@ msgstr[1] "Supprimer {0} chemins" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2945,10 +3117,10 @@ #. 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?" +#: ../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 "" "Vous êtes sur le point de supprimer des nœuds en dehors de la zone " @@ -2956,5 +3128,5 @@ "voyez pas) pourraient les utiliser.
Voulez-vous vraiment les supprimer ?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "Confirmation de suppression" @@ -2972,15 +3144,15 @@ msgstr[1] "Déplacer {0} nœuds" -#: ../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 "Objet purgé ''{0}''" -#: ../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 "Objets ''{0}'' purgés" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154 #, java-format msgid "" @@ -2991,5 +3163,5 @@ "inférieur à 2. Il est actuellement de {1}" -#: ../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}" @@ -3001,11 +3173,4 @@ msgstr "Résoudre les conflits de la liste des membres de la relation {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "" -"Impossible d’annuler la commande \"{0}\" car le calque \"{1}\" n’est plus " -"présent." - #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 #, java-format @@ -3021,6 +3186,5 @@ #, java-format msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''" -msgstr "" -"Supprimer la relation ''{0}'' à la position {1} de la relation ''{2}''" +msgstr "Supprimer la relation ''{0}'' à la position {1} de la relation ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141 @@ -3084,5 +3248,5 @@ msgstr "Appliquer ?" -#: ../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 " @@ -3231,6 +3395,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 "" "Le fichier des préférences a des erreurs.
Création d'une " @@ -3316,5 +3480,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3323,5 +3487,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3329,25 +3493,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 "S" #. 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 "N" #. 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 "O" #. 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 "E" #: ../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 @@ -3370,25 +3534,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}" @@ -3396,6 +3561,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 "" @@ -3458,24 +3623,24 @@ msgstr "F" -#: ../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 "Une primitive avec un ID égal à 0 ne peut pas être invisible." -#: ../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 " @@ -3483,5 +3648,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 "" @@ -3513,6 +3678,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}." @@ -3533,5 +3698,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 @@ -3543,6 +3707,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 "" @@ -3554,109 +3717,109 @@ "le paramètre {0} n’est pas dans la plage 0...{1}, il est actuellement de {2}" -#: ../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 "La zone n'est pas fermée." -#: ../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 "Le multipolygone \"{0}\" n'est pas fermé." -#: ../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 "Membre \"{0}\" supprimé de la relation." -#: ../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 "Chemin \"{0}\" comporte moins de deux points." -#: ../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 "Plus d'un chemin d'origine trouvé." -#: ../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 "Plus d'un chemin \"destination\" trouvé." -#: ../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 "Plus d'un \"via\" trouvé." -#: ../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 "Rôle inconnu \"{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 "Type de membre inconnu pour \"{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 "Pas de chemin d'origine trouvé." -#: ../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 "Pas de chemin \"destination\" trouvé." -#: ../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 "Pas de noeud ou de chemin \"via\" trouvé." -#: ../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 "" "Le chemin d'origine ne commence ou fini pas par un nœud \"de passage\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../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 "Le chemin \"to\" ne commence ou ne fini pas à un noeud \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"." -#: ../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 "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\"" -#: ../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 "Le style de la restriction {0} n'a pas été trouvé." -#: ../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 "Intersection entre les chemins \"{0}\" et \"{1}\"." -#: ../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 "Le chemin intérieur \"{0}\" est à l'extérieur." -#: ../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 "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"." -#: ../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 "Non-chemin \"{0}\" dans le multipolygone." -#: ../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 "Pas de chemin extérieur pour le multipolygone \"{0}\"." -#: ../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." @@ -3664,27 +3827,27 @@ "Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone." -#: ../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 "Le style du chemin extérieur \"{0}\" ne concorde pas." -#: ../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 "non étiqueté" -#: ../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 "texte" -#: ../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 "zone de texte" -#: ../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 "Erreur : {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}" @@ -3696,5 +3859,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 @@ -3713,5 +3876,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 @@ -3731,5 +3894,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 "arrière-plan" @@ -3847,6 +4010,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 "" @@ -3861,5 +4023,5 @@ msgstr "Ne plus afficher" -#: ../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 @@ -3867,32 +4029,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 "incomplet" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "highway" -#: ../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 "voie ferrée" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "voie navigable" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "utilisation du terrain" -#: ../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" @@ -3901,5 +4063,5 @@ msgstr[1] "{0} nœuds" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -4016,6 +4178,6 @@ "lat=y&lon=x&zoom=z or a filename" msgstr "" -"Télécharger comme données GPS brutes. Peut être sous la forme " -"x1,y1,x2,y2·un·URL·contenant·lat=y&lon=x&zoom=z ou un nom de fichier." +"Télécharger comme données GPS brutes. Peut être sous la forme x1,y1,x2," +"y2·un·URL·contenant·lat=y&lon=x&zoom=z ou un nom de fichier." #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 @@ -4154,12 +4316,12 @@ msgstr "L’option {0} a été supprimée car elle n’est plus utilisée." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Fichier" -#: ../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 @@ -4173,19 +4335,19 @@ msgstr "Édition" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Affichage" -#: ../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 "Outils" -#: ../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 "Balises" -#: ../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 @@ -4196,5 +4358,5 @@ msgstr "Menu : {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Audio" @@ -4238,29 +4400,29 @@ msgstr "échelle" -#: ../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 "La longitude géographique au niveau du pointeur de souris." -#: ../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 "Le nom de l’objet au niveau du pointeur de souris." -#: ../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 "La latitude géographique au niveau du pointeur de souris." -#: ../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 "L'angle entre le segment de chemin précédent et l’actuel." -#: ../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 "L’orientation (boussole) du segment en train d’être dessiné." -#: ../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 "La longueur du nouveau segment du chemin étant actuellement dessiné." -#: ../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 " @@ -4268,9 +4430,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(aucun objet)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "Utilisateur :" @@ -4383,5 +4545,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" @@ -4390,5 +4552,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" @@ -4397,5 +4559,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" @@ -4414,5 +4576,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 @@ -4429,5 +4591,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" @@ -4503,22 +4665,22 @@ msgstr "Résolution de conflits" -#: ../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 "paramètre en dehors de la plage : reçu {0}" -#: ../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 "la liste du rôle {0} ne participe pas à une comparaison de paire" -#: ../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 "valeur du paramètre \"index\" inattendue. Reçu {0}" -#: ../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." @@ -4563,6 +4725,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" -msgstr "" -"Liste des éléments de leur jeu de données, i.e. les données du serveur" +msgstr "Liste des éléments de leur jeu de données, i.e. les données du serveur" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 @@ -4572,6 +4733,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" -msgstr "" -"Copier mes nœuds sélectionnés au début de la liste des nœuds fusionnés" +msgstr "Copier mes nœuds sélectionnés au début de la liste des nœuds fusionnés" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 @@ -4608,6 +4768,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 "" "Copier leurs éléments sélectionnés à la fin de la liste des éléments " @@ -4659,6 +4818,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." -msgstr "" -"Supprimer les éléments sélectionnés de la liste des éléments fusionnés" +msgstr "Supprimer les éléments sélectionnés de la liste des éléments fusionnés" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 @@ -4683,6 +4841,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" "Cliquer {0} pour commencer la fusion de leurs " @@ -4692,6 +4850,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" "Clicquer {0} pour arrêter la fusion de leurs éléments " @@ -4752,6 +4910,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 "" "Une erreur est survenue durant la communication avec le " @@ -4788,11 +4946,11 @@ #, 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 "" "Il y a {0} primitives référencées dans la relation {1}
qui sont " -"supprimées sur le serveur.

Voulez-vous les restaurer également " -"?" +"supprimées sur le serveur.

Voulez-vous les restaurer également ?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 @@ -4941,5 +5099,5 @@ msgstr "Primitive" -#: ../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 "" @@ -5077,5 +5235,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 "Appliquer" @@ -5175,7 +5333,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" @@ -5185,6 +5343,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" @@ -5218,7 +5376,5 @@ msgstr "Pas encore décidé." -#. --- 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 "Rôle :" @@ -5307,5 +5463,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 @@ -5374,10 +5530,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 "" @@ -5452,18 +5607,18 @@ msgstr "Mode filtre" -#: ../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 "Historique" -#: ../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 "Afficher l’historique de tous les articles sélectionnés." -#: ../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 @@ -5473,14 +5628,13 @@ msgstr "Recharger" -#: ../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 "" -"Recharger les objets actuellement sélectionnés et rafraîchir la liste." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301 +msgstr "Recharger les objets actuellement sélectionnés et rafraîchir la liste." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303 msgid "Show" msgstr "Afficher" -#: ../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 "Afficher l'historique de l'élément sélectionné." @@ -5674,5 +5828,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 "" @@ -5717,25 +5871,25 @@ msgstr "Zoomer sur la sélection" -#: ../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 "Sél.: Rel.:{0}/Chemins:{1}/Nœuds:{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 "Sélection" -#: ../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 "Sélection : {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 "Détacher le panneau" -#: ../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." @@ -5744,5 +5898,5 @@ "d'outils de gauche." -#: ../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 "Cliquer pour minimiser/maximiser le contenu du panneau" @@ -5803,37 +5957,37 @@ msgstr "# Objets" -#: ../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 "éditer la relation en référence du membre de relation sélectionné" -#: ../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 "Télécharger toutes les relations enfants (récursivement)" -#: ../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 "Télécharger tout les éléments enfants" -#: ../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 "Télécharger les relations sélectionnée." -#: ../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 "Télécharger les éléments enfants sélectionnés" -#: ../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 "télécharger les membres de la relation" -#: ../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 "Conflits dans les données" -#: ../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 "" @@ -5844,17 +5998,18 @@ "être chargée." -#: ../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 "La relation est supprimée." -#: ../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 "Téléchargement de la relation {0}" -#: ../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}" @@ -5862,22 +6017,49 @@ "Attention : exception ignorée car la tâche est annulée. Exception : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +#: ../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] "Téléchargement de la relation ''{0}''" +msgstr[1] "Téléchargement de la relation ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "télécharger les membres de la relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "Téléchargement de la relation ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 msgid "Tags and Members" msgstr "Étiquettes et membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Parent Relations" msgstr "Relations parentes" -#: ../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 "Relations enfants" -#: ../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 "Appliquer le rôle" + +#: ../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 "Définir un rôle pour les membres sélectionnés" + +#: ../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?" +"relation itself.
This creates circular dependencies and is discouraged." +"
How do you want to proceed with circular dependencies?" msgstr "" "Il y a au moins un membre de cette relation qui réfère
à la " @@ -5886,26 +6068,26 @@ "circulaires ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java: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 "Les ignorer, laisser la relation telle quelle." -#: ../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 "" @@ -5915,5 +6097,5 @@ 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" @@ -5922,5 +6104,5 @@ "premier membre" -#: ../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" @@ -5929,5 +6111,5 @@ "dernier membre" -#: ../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 " @@ -5935,5 +6117,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 " @@ -5941,20 +6123,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 "Éditeur de relation : supprimer la sélection" -#: ../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 "" @@ -5963,66 +6145,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 "trier les membres de la relation" -#. 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 "Sport" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 msgid "Relation Editor: Sort" msgstr "éditeur de relation : trier" -#: ../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 "Déplacer les membres sélectionnés vers le haut" #. 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 "Éditeur de relation : déplacer vers le haut" -#: ../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 "Déplacer les membres sélectionnés vers le bas" #. 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 "Éditeur de relation : déplacer vers le bas" -#: ../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 "Supprimer le membre actuellement sélectionné de cette relation." #. 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 "éditeur de relation : supprimer" -#: ../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 "Supprimer la relation actuellement éditée." -#: ../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 "Oui, créer un conflit et fermer." -#: ../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 "Non, continuer à éditer." +#: ../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 " @@ -6031,54 +6217,60 @@ 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 "Conflit dans les données." -#: ../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 "Appliquer les mises-à-jour suivantes" -#: ../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 "Appliquer les changements et fermer" -#: ../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 "Annuler les changements et fermer" -#: ../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 "Ajouter un attribut vide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 -msgid "Download all incomplete ways and nodes in relation" -msgstr "" -"Télécharger tous les chemins et les nœuds incomplets dans la relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#, fuzzy +msgid "Download all incomplete members" +msgstr "télécharger les membres de la relation" + +#: ../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 "Télécharger les membres" -#: ../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 "Éditeur de relation : télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#, fuzzy +msgid "Download selected incomplete members" +msgstr "télécharger les membres de la relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 msgid "Sets a role for the selected members" msgstr "Définir un rôle pour les membres sélectionnés" -#: ../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 "Appliquer le rôle" -#: ../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 "" @@ -6088,41 +6280,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 "Oui, l'appliquer." -#: ../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 "Non, ne pas l'appliquer." -#: ../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 "éditer la relation en référence du membre de relation sélectionné" -#. download the relation -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 -#, java-format -msgid "Downloading relation ''{0}''" -msgstr "Téléchargement de la relation ''{0}''" - -#: ../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 "Zoomer à" -#: ../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 "" @@ -6163,19 +6348,19 @@ msgstr "éditer la relation sélectionnée" -#: ../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 "Appliquer les modifications" -#: ../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 "Créer une nouvelle relation dans la couche \"{0}\"" -#: ../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 "éditer la nouvelle relation dans la couche \"{0}\"" -#: ../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}''" @@ -6187,6 +6372,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 "" @@ -6375,7 +6559,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 "" @@ -7149,5 +7332,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 @@ -7388,6 +7571,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 "" @@ -7397,6 +7580,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 "" @@ -7667,14 +7850,14 @@ 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 "Informations sur l'ensemble de changements" -#: ../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 "" "Lancer un navigateur avec les informations sur l'ensemble de changements" -#: ../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}" @@ -7728,6 +7911,6 @@ msgid "Please select the changesets you want to close" msgstr "" -"Veuillez sélectionner l'ensemble de changement que vous voulez " -"fermer" +"Veuillez sélectionner l'ensemble de changement que vous voulez fermer" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 @@ -7777,6 +7960,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 "" @@ -7856,6 +8038,6 @@ msgstr[1] "" "Les calques {0} comportent des conflits non résolus.
Résolvez-les " -"ou abandonnez les modifications.
Calques qui comportent des conflits " -":" +"ou abandonnez les modifications.
Calques qui comportent des conflits :" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 @@ -7870,6 +8052,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] "" @@ -7883,6 +8065,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 " @@ -7941,5 +8123,5 @@ msgstr "Préparation du calque \"{0}\" pour l'envoi…" -#: ../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 " @@ -7947,5 +8129,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 "Envoi et/ou sauvegarde incomplet." @@ -8018,40 +8200,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 "Envoyer" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 msgid "Settings" msgstr "Paramètres" -#: ../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 "Tags du nouvel ensemble de changements" -#: ../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 "Objets à ajouter :" -#: ../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 "Objets à modifier :" -#: ../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 "Objets à supprimer :" -#: ../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:" @@ -8060,5 +8242,5 @@ msgstr[1] "{0} objets à ajouter :" -#: ../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:" @@ -8067,5 +8249,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:" @@ -8074,13 +8256,13 @@ msgstr[1] "{0} objets à supprimer :" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 msgid "Upload Changes" msgstr "Envoyer les changements" -#: ../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 "" @@ -8088,59 +8270,56 @@ "caractères)" -#: ../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 "Veuillez d’abord saisir les coordonnées désirées." + +#: ../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 "" -"Permettre l'envoi de tous les changements en une requête, désactivez pour " -"utiliser une requête par primitive modifiée" - -#: ../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 "Fournissez un bref commentaire aux changements que vous envoyez :" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../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 "Ouvrir un nouvel ensemble de changements" -#: ../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 "" "Ouvrir un nouvel ensemble de changements et l'utiliser pour le prochain envoi" -#: ../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 "Utiliser ensemble de changements ouvert" -#: ../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 "Envoyer les données vers un ensemble de changements déjà ouvert" -#: ../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 "Fermer l'ensemble de changements après l'envoi" -#: ../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 "Fermer l'ensemble de changements après le prochain envoi" -#: ../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}" @@ -8148,16 +8327,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 "Charger la liste de vos ensembles de changements depuis le serveur" -#: ../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 "Fermer l'ensemble de changements actuellement ouvert" -#: ../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}." @@ -8165,6 +8344,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 "" @@ -8175,5 +8354,5 @@ "ignoré pour compléter l'envoi." -#: ../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 "" @@ -8203,111 +8382,59 @@ msgstr "Continuer à envoyer." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Images pour {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "Lecture GPX..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Aucune heure pour le point {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 "Impossible de lire l’heure \"{0}\" du point {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 "Lecture de {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Aucune image avec des informations horaires lisibles trouvée." - -#: ../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 "Images géolocalisées" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "Allumage du GPS : {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "Extinction du GPS : {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "variation différentielle actuelle : {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "différence de fuseau horaire : " - -#: ../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] "image" -msgstr[1] "images" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} dans la trace." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Synchroniser l’horloge" - -#: ../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 "images JPEG (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "La date du fichier \"{0}\" n'a pas pu être analysée." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Image" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Synchroniser l’heure avec l’instrument GPS" - -#: ../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 "La date indiquée ne peut être analysée." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, fuzzy, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "Attention : impossible de forcer les préférences pour ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 +#, fuzzy +msgid "Upload data in one request" +msgstr "Envoyer les données vers un ensemble de changements déjà ouvert" + +#: ../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 +#, fuzzy +msgid "(1 request)" +msgstr "Requête incorrecte" + +#: ../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} mètres" +msgstr[1] "{0} mètres" + +#: ../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 "Veuillez entrer une chaine de caractère comme filtre." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 +#, fuzzy, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" +"Le fichier ''{0}'' n'est pas inscriptible. Veuillez spécifier un autre nom " +"de fichier." + +#: ../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 @@ -8315,30 +8442,30 @@ msgstr "point 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 "Personnaliser le dessin des lignes" -#: ../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 "Utiliser les réglages généraux." -#: ../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 "Dessiner des lignes entre les points pour ce calque." -#: ../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 "Ne pas dessiner de ligne entre les points pour ce calque." -#: ../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 "Sélectionner les options de dessin des lignes" -#: ../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 @@ -8346,5 +8473,5 @@ msgstr "Personnaliser la couleur" -#: ../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 @@ -8353,5 +8480,5 @@ msgstr "Par défaut" -#: ../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 @@ -8360,58 +8487,63 @@ msgstr "Choisir une couleur" -#: ../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 "Marqueurs depuis des points nommés" -#: ../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 "Points de parcours nommés depuis {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215 msgid "Import Audio" msgstr "Importer Audio" -#: ../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 "Fichiers audio Wave (*.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 "Marqueurs audio de {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 "Importer des images" -#: ../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 "images JPEG (*.jpg)" + +#: ../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 "Nom : {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 @@ -8419,5 +8551,5 @@ msgstr "Description : {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" @@ -8427,5 +8559,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 @@ -8433,22 +8565,17 @@ msgstr "Description" -#: ../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 "Longueur" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 -msgid "URL" -msgstr "URL" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443 msgid "Length: " msgstr "Longueur : " -#: ../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, " @@ -8457,5 +8584,5 @@ msgstr[1] "{0} chemins, " -#: ../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" @@ -8464,13 +8591,13 @@ msgstr[1] "{0} chemins" -#: ../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 "Convertir en calque de données" -#: ../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:" +#: ../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 "" "L’envoi de données GPS non mises en forme comme données
sur la " @@ -8478,11 +8605,11 @@ "regardez ici :" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8492,29 +8619,29 @@ msgstr "Converti depuis: {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 "Télécharger depuis OSM le long de cette trace" -#: ../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 "Tout télécharger dans un rayon de :" -#: ../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} mètres" -#: ../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 "Aire maximale par requête:" -#: ../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} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8525,5 +8652,5 @@ "Voulez-vous
continuer ?" -#: ../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 "" @@ -8531,5 +8658,5 @@ "audio." -#: ../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 " @@ -8539,5 +8666,5 @@ "chemin ont été omis ou déplacés au début." -#: ../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 " @@ -8547,19 +8674,19 @@ "estimer leur horodatage ont été omis." -#: ../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 "Couche de données {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 "en dehors de la zone téléchargée" -#: ../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 "version {0}" -#: ../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 "" @@ -8567,5 +8694,5 @@ "0.5" -#: ../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." @@ -8574,5 +8701,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 "" @@ -8586,5 +8713,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 "" @@ -8597,11 +8724,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" @@ -8610,32 +8737,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} est consistué de :" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 msgid "unset" msgstr "non défini" -#: ../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 "Version de l’API : {0}" -#: ../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 "Convertir en calque GPX" -#: ../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:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 msgid "No problems found" msgstr "Pas de problème trouvé." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 msgid "Following problems found:" msgstr "" @@ -8643,6 +8770,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 "" @@ -8681,4 +8808,364 @@ msgstr[1] "{0} points" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "Fichiers GPX (*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "Le fichier {0} est maintenant chargé sous le nom \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#, java-format +msgid "Error while parsing {0}" +msgstr "Erreur pendant le traitement {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Impossible de lire \"{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 "" +"Prenez une photo de votre GPS quand il affiche l’heure.
Affichez " +"votre photo ici.
Ensuite, entrez simplement l’heure que vous lisez sur la " +"hpoto et sélectionnez un fuseau horaire.
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Heure de la photo (information EXIF) :" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "Heure du GPS (lu sur la photo) : " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [jj/mm/aaa hh:mm:ss]" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +msgid "I'm in the timezone of: " +msgstr "Je suis dans le fuseau horaire de : " + +#: ../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 "Aucune date" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "Ouvrez une autre photo" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +msgid "Synchronize time from a photo of the GPS receiver" +msgstr "Synchroniser l’heure avec une photo du GPS" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"Erreur pour analyser la date.\n" +"Merci d’utiliser le format demandé" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "Date non valide" + +#: ../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 "Trace GPX : " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Ouvrir une autre trace GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +msgid "Timezone: " +msgstr "Fuseau horaire : " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +msgid "Offset:" +msgstr "Décallage :" + +#: ../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 "" +"Je peux prendre un autre phot de mon GPS.
Cela peut-il aider ?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 +msgid "Update position for: " +msgstr "Mettre à jour la position pour : " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 +msgid "All images" +msgstr "Toutes les images" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 +msgid "Images with no exif position" +msgstr "Images sans position EXIF" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 +msgid "Not yet tagged images" +msgstr "Images non encore étiquetées" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +msgid "Correlate images with GPX track" +msgstr "Correler les images avec la trace GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Correlate" +msgstr "Corréler" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Auto-Guess" +msgstr "Estimation automatique" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +msgid "You should select a GPX track" +msgstr "Vous devez sélectionner une trace GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "Aucune trace GPX sélectionnée" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Erreur de lecture du fuseau horaire.\n" +"Format attendu : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +msgid "Invalid timezone" +msgstr "Fuseau horaire invalide" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Erreur d'analyse syntaxique de l'offset.\n" +"Format attendu : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +msgid "Invalid offset" +msgstr "Décallage invalide" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "Trouvé {0} correspondances sur {1} dans la trace GPX {2}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "Trace GPX chargée" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 +msgid "The selected photos don't contain time information." +msgstr "" +"Les photos sélectionnées ne contiennent pas d'information d'horodatage." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 +msgid "Photos don't contain time information" +msgstr "Les photos ne contienne tpas d'information d'horodatage" + +#: ../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 "" +"La trace GPX sélectionnée n'est pas horodatée. Veuillez en sélectionner une " +"autre." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "La trace GPX n'a pas d'horodatage." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "Fuseau horaire : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "Minutes : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "Secondes : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "{0} photo(s) sur {1} correspond(ent) à la trace GPX." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "(Différence de temps de {0} jours)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "Différence entre la trace et les photos : {0}min. {1}sec." + +#: ../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 "" +"Une erreur est survenue lors de la correspondance des photos avec la trace " +"GPX. Vous pouvez ajuster les ascenseurs pour faire correspondre les photos " +"manuellement." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 +msgid "Matching photos to track failed" +msgstr "La correspondance des photos avec la trace a échoué" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +msgid "Adjust timezone and offset" +msgstr "Ajuster le fuseau horaire et le décalage" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +msgid "Default Values" +msgstr "Valeurs par défaut" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +msgid "Extracting GPS locations from EXIF" +msgstr "Extractions des positions GPS depuis les informations EXIF" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +msgid "Starting directory scan" +msgstr "Début du parcours du dossier" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +msgid "One of the selected files was null" +msgstr "Un des fichiers sélectionnés était vide." + +#: ../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 "Lexture des images..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "Lecture de {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 "Impossible d’obtenir le chemin canonique du dossier {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "Parcours du dossier {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "Fichier vide trouvé dans le dossier {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Erreur lors de la récupération des fichiers du dossier {0}\n" + +#: ../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 "Images géolocalisées" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "Corréler en GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "image" +msgstr[1] "images" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "{0} ont été trouvées pour être géoétiquettées." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +msgid "No image" +msgstr "Aucune image" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "Chargement {0}" + +#: ../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 "Erreur sur le fichier {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Afficher les images géo-étiquetées" + +#: ../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 "Précédent" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Supprimer la photo du calque" + +#: ../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 "Suivant" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "Centrer la vue" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +msgid "Zoom best fit and 1:1" +msgstr "Meilleur zoom et 1:1" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#, java-format +msgid "" +"\n" +"Altitude: {0} m" +msgstr "" +"\n" +"Altitude : {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8903,6 +9390,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71 msgid "When importing audio, make markers from..." -msgstr "" -"Lors de l’import de fichiers audio, faire des marqueurs à partir de :" +msgstr "Lors de l’import de fichiers audio, faire des marqueurs à partir de :" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75 @@ -8944,6 +9430,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104 msgid "The amount by which the speed is multiplied for fast forwarding" -msgstr "" -"Quantité par laquelle la vitesse est multipliée pour l’avance rapide." +msgstr "Quantité par laquelle la vitesse est multipliée pour l’avance rapide." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105 @@ -9013,5 +9498,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 @@ -9214,6 +9699,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 "" "Dessiner les flèches de direction en utilisant un aperçu des données plutôt " @@ -9281,6 +9765,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 "Appliquer un lissage des dessins de la carte." @@ -9354,19 +9837,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 "Apparence et ressenti" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Langue" + +#: ../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 "Par défaut (déterminé automatiquement)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Langue" - -#: ../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 @@ -9469,6 +9952,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108 msgid "You have to restart JOSM for some settings to take effect." -msgstr "" -"Vous devez redémarrer JOSM pour que certains réglages prennent effet." +msgstr "Vous devez redémarrer JOSM pour que certains réglages prennent effet." #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 @@ -9628,6 +10110,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 "" @@ -9692,6 +10174,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 "" "

De plus, les raccourcis sont activés lorsque les actions sont assignées à " @@ -9710,9 +10192,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 "" "

Vous pouvez remarquer que la liste de sélection des clés sur la page " @@ -9751,6 +10232,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 "

Le pseudo-modifieur 'désactivé' désactivera le raccourci.

" @@ -9843,5 +10324,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 "Plus d'informations à propos de cette balise" @@ -9928,5 +10409,5 @@ msgstr "Téléchargement des points {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 @@ -9934,5 +10415,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -10057,16 +10538,15 @@ msgstr "Mode {0} inconnu." -#: ../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." +#: ../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 "" "pas de primitive d’id {0} dans le jeu de données local. Impossible de " "déduire le type de primitive" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../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 @@ -10095,20 +10575,20 @@ "Le serveur a répondu avec une erreur 404 pour l’id {0}. Passage au suivant." -#: ../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 " @@ -10117,4 +10597,11 @@ "Le serveur a répondu par une erreur 404, nouvelle tentative en utilisant des " "requêtes individuelles pour chaque primitive" + +#: ../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] "Téléchargement de la relation ''{0}''" +msgstr[1] "Téléchargement de la relation ''{0}''" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10156,18 +10643,18 @@ msgstr "préférence \"{0}\" manquante. Impossible d’initialiser OsmApi" -#: ../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 "Cette version de JOSM est incompatible avec le serveur défini." -#: ../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}." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#, fuzzy, java-format +msgid "" +"It supports protocol version 0.6, while the server says it supports {0} to " +"{1}." msgstr "" "Elle supporte les protocoles de version 0.5 ou 0.6, alors que le serveur ne " "supporte que les versions {0} à {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 #, java-format msgid "Communications with {0} established using protocol version {1}." @@ -10175,11 +10662,11 @@ "Communication établie avec {0} en utilisant le protocole de version {1}" -#: ../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 "format d’id inattendu reçu du serveur, reçu \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 #, java-format msgid "" @@ -10189,66 +10676,66 @@ "\"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 msgid "Creating changeset..." msgstr "Création d'un ensemble de changements…" -#: ../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 "ensemble de changements {0} ouvert avec succès" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 msgid "Updating changeset..." msgstr "Mise à jour de l'ensemble de changements" -#: ../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 "Mise à jour de l’ensemble de changements {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 msgid "Closing changeset..." msgstr "Fermeture de la révision..." -#: ../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 "Pas de nouveau changement à envoyer" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "Preparing..." msgstr "Préparation en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Envoi en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Waiting 10 seconds ... " msgstr "Attends 10 secondes… " -#: ../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}." @@ -10283,5 +10770,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}''." @@ -10308,5 +10795,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}." @@ -10314,5 +10801,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}" @@ -10325,5 +10812,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}''." @@ -10383,7 +10870,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 "" "ATTENTION : Le mot de passe est stocké en texte clair dans le fichier " @@ -10414,9 +10901,9 @@ #, java-format msgid "" -"An error occurred while restoring backup file.
Error " -"is:
{0}" -msgstr "" -"Une erreur est survenue lors du chargement d'une " -"sauvegarde.
L'erreur est :
{0}" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" +"Une erreur est survenue lors du chargement d'une sauvegarde." +"
L'erreur est :
{0}" #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 @@ -10489,46 +10976,45 @@ msgstr "Le fichier \"{0}\" n'existe pas" -#: ../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 "" @@ -10536,19 +11022,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 "Champ incomplet avec ref=0" -#: ../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 "L’objet avec l’id=0 est illégal" -#: ../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 "" @@ -10558,8 +11044,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 "" @@ -10569,25 +11055,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 "" @@ -10595,5 +11081,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10602,5 +11088,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10608,5 +11094,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10615,13 +11101,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 "Préparation des données de OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 msgid "Parsing OSM data..." msgstr "Préparation des données d'OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 msgid "Preparing data set..." msgstr "" @@ -10674,4 +11160,10 @@ msgid "Contacting Server..." msgstr "Contact du serveur..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 +#, fuzzy, java-format +msgid "Expected value > 0 for parameter ''{0}'', got {1}" +msgstr "valeur du paramètre \"index\" inattendue. Reçu {0}" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10711,43 +11203,44 @@ 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 +#, fuzzy, java-format +msgid "Value >0 expected for parameter ''{0}'', got {1}" +msgstr "valeur du paramètre \"index\" inattendue. Reçu {0}" + +#: ../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 +#, fuzzy, java-format +msgid "({0}/{1}) Uploading {2} objects..." +msgstr "Envoi de {0} objets…" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "Envoi des données…" - -#: ../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 "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10788,17 +11281,27 @@ msgstr "Téléchargement du greffon {0}..." -#: ../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 "Supprimer {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Impossible de supprimer le fichier du greffon : {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 msgid "Skip download" msgstr "Annuler le téléchargement" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Download Plugin" msgstr "Télécharger le greffon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Skip Download" msgstr "Annuler le téléchargement" -#: ../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}." @@ -10810,20 +11313,18 @@ msgstr "Une erreur est survenue dans le greffon {0}" -#: ../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 "" -"Le chargement du greffon {0} a été demandé. Ce greffon n'est plus nécessaire." - -#: ../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" @@ -10832,51 +11333,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 "La dernière mise à jour du greffon date de plus de {0} jours." -#: ../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 "Mettre à jour les greffons." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 msgid "Skip update" msgstr "Passer la mise à jour." -#: ../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 "Le greffon {0} nécessite la mise à jour de JOSM vers la version {1}." -#: ../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 "" -"Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181 +msgstr "Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182 #, java-format msgid "Plugin not found: {0}." msgstr "Greffon non trouvé : {0}" -#: ../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 "Impossible de charger le greffon {0}. Le supprimer des préférences ?" -#: ../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 "Désactiver le greffon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Keep plugin" msgstr "Garder le greffon" -#: ../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 " @@ -10886,9 +11386,9 @@ "l’autorisation de remplacer les greffons existants." -#: ../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 "" @@ -10897,10 +11397,10 @@ "Une exception inattendue pouvant provenir du greffon \"{0}\" s’est produite." -#: ../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 "D’après les informations du greffon, l’auteur est {0}." -#: ../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." @@ -10909,9 +11409,9 @@ "d'extension avant de rapporter un bug." -#: ../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 "Ce module d'extension doit-il être désactivé ?" -#: ../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 " @@ -10921,14 +11421,14 @@ "greffon ne soit plus chargé." -#: ../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 "" "Le greffon ne peut pas être supprimé. Il était probablement déjà désactivé." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:386 msgid "Plugin information" msgstr "Informations sur le greffon" -#: ../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" @@ -11048,6 +11548,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 "" @@ -11085,6 +11585,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 "" "L’envoi vers le serveur a échoué car votre jeu " @@ -11151,11 +11651,10 @@ #, java-format msgid "" -"The OSM server
''{0}''
reported an internal server " -"error.
This is most likely a temporary problem. Please try again " -"later." -msgstr "" -"Le serveur OSM
''{0}''
a rapporté une erreur interne du " -"serveur.
Il s'agit probablement d'un problème temporaire. Veuillez " -"réessayer plus tard." +"The OSM server
''{0}''
reported an internal server error." +"
This is most likely a temporary problem. Please try again later." +msgstr "" +"Le serveur OSM
''{0}''
a rapporté une erreur interne du serveur." +"
Il s'agit probablement d'un problème temporaire. Veuillez réessayer plus " +"tard." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 @@ -11166,7 +11665,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 "" @@ -11198,6 +11697,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 "" @@ -11468,5 +11967,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" @@ -11481,12 +11980,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 "Impair" -#: ../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 @@ -11494,462 +11991,144 @@ msgstr "Pair" -#: ../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 "Alphabétique" -#: ../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 "Numéro" + +#. 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 "nature" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "Site" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Location" + +#: ../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 +msgstr "Relation : {0}" + +#: ../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 "segment intérieur" + +#: ../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 "Ville :" -#: ../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 "État :" -#: ../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 "Code postal :" -#: ../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 "Pays :" -#: ../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 +msgstr "Adresse complète :" + +#: ../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 +msgstr "Information optionnelle :" + +#: ../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 +msgstr "Le code du pays doit contenir 2 lettres." + +#: ../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 +msgstr "Les adresses alphabétiques doivent finir par une lettre" + +#: ../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 "AgPifoJ - Images géoétiquettées" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "Afficher les images géo-étiquetées" - -#: ../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 "Précédent" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Supprimer la photo du calque" - -#: ../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 "Suivant" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "Centrer la vue" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102 -msgid "Zoom best fit and 1:1" -msgstr "Meilleur zoom et 1:1" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 -#, java-format -msgid "" -"\n" -"Altitude: {0} m" -msgstr "" -"\n" -"Altitude : {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/h" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "Extractions des positions GPS depuis les informations EXIF" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121 -msgid "Starting directory scan" -msgstr "Début du parcours du dossier" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:126 -msgid "One of the selected files was null" -msgstr "Un des fichiers sélectionnés était vide." - -#: ../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 "Lexture des images..." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:186 -#, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "Impossible d’obtenir le chemin canonique du dossier {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "Parcours du dossier {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "Fichier vide trouvé dans le dossier {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Erreur lors de la récupération des fichiers du dossier {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "Corréler en GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} ont été trouvées pour être géoétiquettées." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "Ouvrir les images avec AgPifoJ..." - -#: ../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 "Charger l'ensemble des images comme un nouveau calque." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "Fichiers GPX (*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "Le fichier {0} est maintenant chargé sous le nom \"{1}\"" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#, java-format -msgid "Error while parsing {0}" -msgstr "Erreur pendant le traitement {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Impossible de lire \"{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 "" -"Prenez une photo de votre GPS quand il affiche l’heure.
Affichez " -"votre photo ici.
Ensuite, entrez simplement l’heure que vous lisez sur la " -"hpoto et sélectionnez un fuseau horaire.
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Heure de la photo (information EXIF) :" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "Heure du GPS (lu sur la photo) : " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [jj/mm/aaa hh:mm:ss]" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 -msgid "I'm in the timezone of: " -msgstr "Je suis dans le fuseau horaire de : " - -#: ../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 "Aucune date" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "Ouvrez une autre photo" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 -msgid "Synchronize time from a photo of the GPS receiver" -msgstr "Synchroniser l’heure avec une photo du GPS" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"Erreur pour analyser la date.\n" -"Merci d’utiliser le format demandé" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "Date non valide" - -#: ../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 "Trace GPX : " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Ouvrir une autre trace GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -msgid "Timezone: " -msgstr "Fuseau horaire : " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 -msgid "Offset:" -msgstr "Décallage :" - -#: ../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 "" -"Je peux prendre un autre phot de mon GPS.
Cela peut-il aider " -"?" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Mettre à jour la position pour : " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Toutes les images" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Images sans position EXIF" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Images non encore étiquetées" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 -msgid "Correlate images with GPX track" -msgstr "Correler les images avec la trace GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Correlate" -msgstr "Corréler" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Estimation automatique" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "Vous devez sélectionner une trace GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Aucune trace GPX sélectionnée" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Erreur de lecture du fuseau horaire.\n" -"Format attendu : {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Fuseau horaire invalide" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Erreur d'analyse syntaxique de l'offset.\n" -"Format attendu : {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Décallage invalide" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Trouvé {0} correspondances sur {1} dans la trace GPX {2}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "Trace GPX chargée" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "" -"Les photos sélectionnées ne contiennent pas d'information d'horodatage." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Les photos ne contienne tpas d'information d'horodatage" - -#: ../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 "" -"La trace GPX sélectionnée n'est pas horodatée. Veuillez en sélectionner une " -"autre." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "La trace GPX n'a pas d'horodatage." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Fuseau horaire : {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minutes : {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Secondes : {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "{0} photo(s) sur {1} correspond(ent) à la trace GPX." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Différence de temps de {0} jours)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Différence entre la trace et les photos : {0}min. {1}sec." - -#: ../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 "" -"Une erreur est survenue lors de la correspondance des photos avec la trace " -"GPX. Vous pouvez ajuster les ascenseurs pour faire correspondre les photos " -"manuellement." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "La correspondance des photos avec la trace a échoué" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Ajuster le fuseau horaire et le décalage" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Valeurs par défaut" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433 -msgid "No image" -msgstr "Aucune image" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "Chargement {0}" - -#: ../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 "Erreur sur le fichier {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -12001,13 +12180,13 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" -msgstr "" +msgstr "Fichier de cache Guadeloupe Fort-Marigot (.UTM1)" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 msgid "Guadeloupe Ste-Anne cache file (.UTM2)" -msgstr "" +msgstr "Fichier de cache Guadeloupe Ste-Anne (.UTM2)" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 msgid "Martinique Fort Desaix cache file (.UTM3)" -msgstr "" +msgstr "Fichier de cache Martinique Fort Desaix (.UTM3)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -12105,17 +12284,14 @@ #: ../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." -msgstr "" -"Une prise en charge du WMS du cadastre français à l'adresse " -"www.cadastre.gouv.fr

Merci de lire les conditions d'utilisation ici : " -"
" +"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 "" +"Une prise en charge du WMS du cadastre français à l'adresse www.cadastre." +"gouv.fr

Merci de lire les conditions d'utilisation ici :
" "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " "
avant tout chargement de données créé à partir de ce greffon." @@ -12239,6 +12415,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." -msgstr "" -"Veuillez activer l'auto-sourcing et vérifier le millésime du cadastre." +msgstr "Veuillez activer l'auto-sourcing et vérifier le millésime du cadastre." #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64 @@ -12317,4 +12492,6 @@ "Do you want to use them ?" msgstr "" +"Cette image contient des données géographiques.\n" +"Voulez-vous les utiliser ?" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170 @@ -12445,13 +12622,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:45 msgid "Export as PNG format (only raster images)" -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] "Simplifier le chemin (supprimer {0} nœud)" -msgstr[1] "Simplifier le chemin (supprimer {0} nœuds)" +msgstr "Exporter au format PNG (image tuilée)" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 @@ -12469,4 +12638,6 @@ "a cadastre \"plan image\" (raster image)" msgstr "" +"Ce mode fonctionne uniquement si le calque actif est le cadastre au format " +"plan (image tuilé)" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:20 @@ -12570,14 +12741,14 @@ msgstr "Schéma de couleurs" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 +#: ../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 "Diviser zone" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 msgid "Splits an area by an untagged way." msgstr "Divise une zone à l’aide d'un chemin sans attribut." -#: ../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 " @@ -12719,6 +12890,5 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:177 msgid "Disable data logging if distance falls below" -msgstr "" -"Désactiver l'enregistrement des données si la distance est de moins de" +msgstr "Désactiver l'enregistrement des données si la distance est de moins de" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307 @@ -12792,6 +12962,6 @@ msgstr "" "Imoossible de lire la bibliothèque rxtxSerial. Si vous avez besoin d’aide " -"pour l’installer, essayez la page d’accueil deGlobalsat sur " -"http://www.raphael-mack.de/josm-globalsat-gpx-import-plugin/" +"pour l’installer, essayez la page d’accueil deGlobalsat sur http://www." +"raphael-mack.de/josm-globalsat-gpx-import-plugin/" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 @@ -12895,4 +13065,8 @@ msgstr "Ouvrir les images avec ImageWayPoint" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Charger l'ensemble des images comme un nouveau calque." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -12936,18 +13110,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 "Exécution de la réduction Vertex" -#: ../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 "Exécution de l'approximation de Douglas-Peucker" -#: ../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 "Suppression des nœuds en doublon..." -#: ../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" @@ -12996,7 +13170,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -13006,5 +13180,5 @@ #. 50000 #. -#. +#. #. #. @@ -13014,5 +13188,5 @@ #. 50000 #. -#. +#. #. #. @@ -13021,5 +13195,5 @@ #. 50000 #. -#. +#. #. #. @@ -13029,5 +13203,5 @@ #. 50000 #. -#. +#. #. #. @@ -13105,6 +13279,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 "" "Nombre maximum de segments autorisés dans chaque chemin généré (250 par " @@ -13130,7 +13303,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 "" "Précision de la simplification des lignes par la méthode Douglas-Peucker, en " @@ -13200,20 +13372,19 @@ msgstr "Impossible d'acquérir l'image" -#: ../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 "Connexion en cours" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Connecté" -#. 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 "Pas connecté" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "Échec de la connexion" @@ -13383,6 +13554,5 @@ #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86 msgid "One of the selected ways is already part of another multipolygon." -msgstr "" -"Un des chemins sélectionné fait déjà partie d'un autre multipolygone." +msgstr "Un des chemins sélectionné fait déjà partie d'un autre multipolygone." #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104 @@ -13412,8 +13582,7 @@ "new server? (Strongly recommended)" msgstr "" -"Le greffon openstreetbugs utilise l’ancien serveur sur " -"appspot.com.
Un nouveau serveur est disponible sur " -"schokokeks.org.
Voulez-vous passer au nouveau serveur ? (fortement " -"recommandé)" +"Le greffon openstreetbugs utilise l’ancien serveur sur appspot.com." +"
Un nouveau serveur est disponible sur schokokeks.org.
Voulez-vous " +"passer au nouveau serveur ? (fortement recommandé)" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 @@ -13426,7 +13595,7 @@ "upload this data. Maybe you have selected the wrong layer?" msgstr "" -"Les données sélectionnées contiennent des données de " -"OpenStreetBugs.
Vous ne pouvez pas téléverser ces données. Peut-être avez-" -"vous sélectionné le mauvais calque ?" +"Les données sélectionnées contiennent des données de OpenStreetBugs." +"
Vous ne pouvez pas téléverser ces données. Peut-être avez-vous " +"sélectionné le mauvais calque ?" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -13442,6 +13611,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 "" "L'en-tête contient plusieurs valeurs et ne peut être mappés en un seul Mot" @@ -13528,9 +13696,10 @@ msgstr "Extension de fichier inconnue : {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 "Osmarender" -#: ../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 " @@ -13540,9 +13709,5 @@ "carte des Préférences." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "options osmarender" - -#: ../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 "Exécutable Firefox" @@ -13601,6 +13766,5 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124 msgid "Remote Control has been asked to load data from the API." -msgstr "" -"Il a été demandé à Remote Control de charger les données depuis l'API." +msgstr "Il a été demandé à Remote Control de charger les données depuis l'API." #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 @@ -13733,5 +13897,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 msgid "Show Tile Info" -msgstr "" +msgstr "Monter les informations sur la tuile." #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 @@ -13927,17 +14091,17 @@ "préférences" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" msgstr "Inverser les maisons mitoyennes" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37 msgid "Reverses house numbers on a terrace." msgstr "Inverse les numéros des maisons mitoyennes." -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 msgid "Reverse a Terrace" msgstr "Inverser les maisons mitoyennes" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110 msgid "Reverse Terrace" msgstr "Inverser les maisons mitoyennes" @@ -13981,171 +14145,4 @@ msgid "Optional" msgstr "Optionnel" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "Joindre zones superposées" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Joins areas that overlap each other" -msgstr "Joint les zones qui se superposent l'une l'autre" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 -msgid "Only up to two areas can be joined at the moment." -msgstr "Seul un maximum de deux zones peuvent être jointes pour le moment." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 -#, java-format -msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "\"{0}\" n'est pas fermé et ne peut donc être joint." - -#: ../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 "" -"Le(s) chemin(s) sélectionné(s) contien(nen)t des nœuds en dehors de la zone " -"téléchargée.\n" -"Certains nœuds utilisés en dehors de la zone pourraient être supprimés.\n" -"Voulez-vous vraiment continuer ?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 -msgid "Please abort if you are not sure" -msgstr "Veuillez abandonner si vous n'êtes pas sûr(e)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 -msgid "Please select at least one closed way the should be joined." -msgstr "Veuillez sélectionner au moins un chemin clos devant être fusionné." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175 -msgid "No intersection found. Nothing was changed." -msgstr "Pas d’intersection trouvée. Rien n’a été modifié." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197 -msgid "Added node on all intersections" -msgstr "Noeuds ajoutés sur toutes les intersections" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221 -msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "" -"Supprimer les chemins qui ne font pas partie d'un multipolygone intérieur" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226 -msgid "Fix relations" -msgstr "Corriger les relations" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 -msgid "Joined self-overlapping area" -msgstr "Ai fusionné une aire superposée sur elle même" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 -msgid "Joined overlapping areas" -msgstr "Ai fusionné des aires superposées" - -#: ../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 "" -"Certains chemins faisaient partie de relations qui ont été modifiées. " -"Veuillez vérifier qu'aucune erreur n'a été introduite." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 -msgid "Enter values for all conflicts." -msgstr "Entrer des valeurs pour tous les conflits." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Résoudre les conflits" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312 -msgid "Fix tag conflicts" -msgstr "Corriger les conflits d’attribut" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462 -msgid "Removed Element from Relations" -msgstr "Élément supprimé des relations" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571 -msgid "Join Areas: Remove Short Ways" -msgstr "Aires jointes: enlever les voies courtes" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587 -msgid "Closed Way" -msgstr "Chemin fermé" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854 -msgid "Remove tags from inner ways" -msgstr "Supprime les attributs des chemins internes" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883 -msgid "Join Areas Function" -msgstr "Fonction de jointure des zones" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Jump To Position" -msgstr "Aller à la position" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Opens a dialog that allows to jump to a specific location" -msgstr "" -"Ouvre une boite de dialogue permettant de se rendre à une position spécifique" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 -msgid "Enter Lat/Lon to jump to position." -msgstr "Entrez la Lat./Long. pour vous rendre à la position." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 -msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "Vous pouvez aussi coller une URL de www.openstreetmap.org" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 -msgid "Zoom (in metres)" -msgstr "Zoom (en mètres)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -msgid "Jump there" -msgstr "Aller ici" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 -msgid "Jump to Position" -msgstr "Aller à la position" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Could not parse Latitude, Longitude or Zoom. Please check." -msgstr "" -"Impossible d'analyser la Latitude, Longitude ou le Zoom. Veuillez vérifier." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Unable to parse Lon/Lat" -msgstr "Analyse syntaxique de la Lat./Lon. impossible" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Simplify Way" -msgstr "Simplifier le chemin" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Supprimer les nœuds non nécessaires du chemin" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "Veuillez sélectionner au moins un chemin à simplifier." - -#: ../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] "" -"La sélection contient {0} chemin. Êtes-vous sûr de vouloir le simplifier ?" -msgstr[1] "" -"La sélection contient {0} chemins. Êtes-vous sûr de vouloir les simplifier ?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "Êtes-vous sur ?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14189,6 +14186,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77 msgid "Use the error layer to display problematic elements." -msgstr "" -"Utiliser le calque d’erreur pour montrer les éléments problématiques." +msgstr "Utiliser le calque d’erreur pour montrer les éléments problématiques." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80 @@ -14248,5 +14244,5 @@ msgstr "validation autre" -#: ../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}" @@ -14299,34 +14295,34 @@ msgstr "Ignorer les erreurs sélectionnées à l'avenir." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Groupe complet" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Eléments seuls" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Rien" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Ignorer le groupe complet ou les éléments individuels ?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 msgid "Ignoring elements" msgstr "Ignore les éléments" -#: ../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 "Corrige les erreurs…" -#: ../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 "Corrige ({0}/{1}): ''{2}''" -#: ../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 "Mise-à-jour de la carte…" @@ -14377,19 +14373,19 @@ msgstr "Chemins se croisant" -#: ../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 "Nœuds dupliqués" -#: ../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 "" "Ce test vérifie si des nœuds ne sont pas exactement à la même position." -#: ../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 "Nœuds à la même position" -#: ../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 "Confirmation" @@ -14632,7 +14628,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 "" "Les sources (URL ou nom de fichier) du vérificateur orthographique (voir " @@ -14782,5 +14777,5 @@ #. 50000 #. -#. +#. #. #. @@ -14788,5 +14783,5 @@ #. #. -#. +#. #. #. @@ -14796,5 +14791,5 @@ #. 50000 #. -#. +#. #. #. @@ -14803,5 +14798,5 @@ #. 50000 #. -#. +#. #. #. @@ -14810,5 +14805,5 @@ #. 50000 #. -#. +#. #. #. @@ -14817,5 +14812,5 @@ #. 50000 #. -#. +#. #. #. @@ -14824,5 +14819,5 @@ #. 50000 #. -#. +#. #. #. @@ -14831,9 +14826,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14878,5 +14873,5 @@ #. 50000 #. -#. +#. #. #. @@ -14931,6 +14926,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60 msgid "This test checks for untagged, empty and one node ways." -msgstr "" -"Ce test vérifie les chemins sans attribut, vides ou avec un seul nœud." +msgstr "Ce test vérifie les chemins sans attribut, vides ou avec un seul nœud." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91 @@ -15019,14 +15013,14 @@ msgstr "Walking Papers" -#: ../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 "Téléchargement de chemin" -#: ../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 " @@ -15035,14 +15029,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 "" @@ -15051,5 +15045,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 "" @@ -15061,13 +15055,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 "Fusionner les nœuds dupliqués ?" -#: ../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." @@ -15159,6 +15153,6 @@ "or a trailing '?'." msgstr "" -"Attention : l’adresse du service WMS « {0} » ne se finit ni par « & », ni " -"par « ? »." +"Attention : l’adresse du service WMS « {0} » ne se finit ni par « & », ni par " +"« ? »." #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 @@ -15232,37 +15226,37 @@ "résolution." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "Télécharger les tuiles visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "Changer la résolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Reload erroneous tiles" msgstr "Recharger les tuiles erronées" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Alpha channel" msgstr "Canal alpha" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:369 msgid "Save WMS layer to file" msgstr "Sauvegarder un calque WMS dans un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "Sauvegarder la couche WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "Charger un calque WMS depuis un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "Charger la couche WMS" -#: ../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}" @@ -15271,13 +15265,13 @@ "attendue" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "File Format Error" msgstr "Erreur de format de fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "Erreur lors du chargement du fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -15354,5 +15348,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 "" @@ -15396,23 +15390,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 "" -"Un autre greffon de géo-marquage pour JOSM. Corrèle des photos avec des " -"traces GPS, ou importe des photos géo-marquées." - -#. Plugin cadastre-fr -#: build/trans_plugins.java:7 msgid "A special handler for the French land registry WMS server." msgstr "Une prise en charge du serveur WMS du cadastre français." #. Plugin colorscheme -#: build/trans_plugins.java:9 +#: build/trans_plugins.java:7 msgid "" "Allows the user to create different color schemes and to switch between " @@ -15429,22 +15416,22 @@ #. Plugin Create_grid_of_ways -#: build/trans_plugins.java:11 +#: build/trans_plugins.java:9 msgid "Create a grid of ways." msgstr "Créer un réseau de voies" #. Plugin czechaddress +#: build/trans_plugins.java:11 +msgid "" +"Creating and handling address nodes and buildings within Czech Republic." +msgstr "" +"Crée et gère les adresses des nœuds et bâtiments en République Tchèque." + +#. Plugin dataimport #: build/trans_plugins.java:13 -msgid "" -"Creating and handling address nodes and buildings within Czech Republic." -msgstr "" -"Crée et gère les adresses des nœuds et bâtiments en République Tchèque." - -#. Plugin dataimport -#: build/trans_plugins.java:15 msgid "Allows to import various file formats into JOSM directly." msgstr "Permet d’importer divers formats de fichiers directement dans JOSM." #. Plugin DirectUpload -#: build/trans_plugins.java:17 +#: build/trans_plugins.java:15 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " @@ -15455,10 +15442,10 @@ #. Plugin Duplicate-Way -#: build/trans_plugins.java:19 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "Voies dupliquées avec un décalage" #. Plugin editgpx -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -15469,7 +15456,6 @@ #. Plugin globalsat -#: build/trans_plugins.java:23 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" "Téléchargez les points GPS depuis un système d'enregistrement Globalsat " @@ -15477,15 +15463,15 @@ #. Plugin graphview -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:23 msgid "Visualizes routing information as a routing graph." msgstr "Visualiser les informations de routage comme un calque de routage." #. Plugin grid -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Fourni une couche d'arrière plan affichant une grille" #. Plugin ImageWayPoint -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -15498,10 +15484,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Aide à vectoriser des images WMS." #. Plugin livegps -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -15511,5 +15497,5 @@ #. Plugin measurement -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -15523,10 +15509,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 " @@ -15535,5 +15521,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 " @@ -15546,15 +15532,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:41 msgid "Displays an OpenLayers background image" msgstr "Affiche une image d'arrière plan provenant d'OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:43 msgid "Imports issues from OpenStreetBugs" msgstr "Importe les erreurs d'OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:45 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -15564,5 +15550,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:47 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -15572,5 +15558,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:49 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -15581,15 +15567,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:51 msgid "The great JGoodies Plastic Look and Feel." msgstr "L'apparence et le ressenti du superbe JGoodies Plastic" #. Plugin remotecontrol -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:53 msgid "Let other applications send commands to JOSM." msgstr "Permet aux autres applications d'envoyer des commandes vers JOSM." #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15597,14 +15583,14 @@ msgstr "" "Permet de faire un rendu des routes (bus, chemins de randonnées, itinéraires " -"cyclables…). Les types de routes doivent être défini dans le fichier " -"routes.xml, dans le dossier du greffon." +"cyclables…). Les types de routes doivent être défini dans le fichier routes." +"xml, dans le dossier du greffon." #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:57 msgid "Provides routing capabilities." msgstr "Fournit des capacités de routage/calcul d'itinéraire" #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:59 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -15615,16 +15601,15 @@ #. Plugin surveyor +#: build/trans_plugins.java:61 +msgid "Allow adding markers/nodes on current gps positions." +msgstr "Permet d'ajouter des marqueurs/points sur les positions GPS courantes." + +#. Plugin tageditor #: build/trans_plugins.java:63 -msgid "Allow adding markers/nodes on current gps positions." -msgstr "" -"Permet d'ajouter des marqueurs/points sur les positions GPS courantes." - -#. Plugin tageditor -#: build/trans_plugins.java:65 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Ouvre une fenêtre de modification des attributs sous forme de table." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:65 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -15637,19 +15622,10 @@ #. Plugin terracer -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:67 msgid "Make terraced houses out of single blocks." msgstr "Crée des maisons mitoyennes depuis des blocs entiers." -#. 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 "" -"Quelques utilitaires qui vous rendent la vie plus facile : par ex. " -"simplifier un chemin, joindre des aires, aller à une position." - #. Plugin validator -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -15661,25 +15637,24 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " "plugin is still under early development and may be buggy." msgstr "" -"Permet le téléchargement de cartes scannée et tuilées depuis walking-" -"papers.org. Ce plugin est encore en développement et pourrait contenir des " -"bugs" +"Permet le téléchargement de cartes scannée et tuilées depuis walking-papers." +"org. Ce plugin est encore en développement et pourrait contenir des bugs" #. Plugin waydownloader -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "Téléchargement facile le long de plusieurs chemins interconnectés" #. Plugin wmsplugin -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." msgstr "" -"Affiche des images géo-référencées en fond d'écran (serveurs WMS, Yahoo, " -"...)." +"Affiche des images géo-référencées en fond d'écran (serveurs WMS, " +"Yahoo, ...)." #. #. -#. +#. #. #. @@ -16927,5 +16902,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16935,5 +16910,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16952,5 +16927,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16960,5 +16935,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16977,5 +16952,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16985,5 +16960,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17002,5 +16977,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17010,5 +16985,5 @@ #. 300000 #. -#. +#. #. #. @@ -17023,5 +16998,5 @@ #. 300000 #. -#. +#. #. #. @@ -17039,5 +17014,5 @@ #. 50000 #. -#. +#. #. #. @@ -17055,5 +17030,5 @@ #. 40000 #. -#. +#. #. #. @@ -17062,5 +17037,5 @@ #. 40000 #. -#. +#. #. #. @@ -17070,5 +17045,5 @@ #. 50000 #. -#. +#. #. #. @@ -17088,5 +17063,5 @@ #. 50000 #. -#. +#. #. #. @@ -17095,5 +17070,5 @@ #. 50000 #. -#. +#. #. #. @@ -17103,5 +17078,5 @@ #. 50000 #. -#. +#. #. #. @@ -17151,7 +17126,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17850,5 +17825,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17887,5 +17862,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17981,5 +17956,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -18136,5 +18111,5 @@ #. 50000 #. -#. +#. #. #. @@ -19521,5 +19496,5 @@ #. 30000 #. -#. +#. #. #. @@ -19529,5 +19504,5 @@ #. 40000 #. -#. +#. #. #. @@ -19537,5 +19512,5 @@ #. 20000 #. -#. +#. #. #. @@ -19545,5 +19520,5 @@ #. 40000 #. -#. +#. #. #. @@ -19901,7 +19876,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19911,5 +19886,5 @@ #. 50000 #. -#. +#. #. #. @@ -19919,5 +19894,5 @@ #. 50000 #. -#. +#. #. #. @@ -19927,5 +19902,5 @@ #. 50000 #. -#. +#. #. #. @@ -19935,5 +19910,5 @@ #. 50000 #. -#. +#. #. #. @@ -19943,5 +19918,5 @@ #. 50000 #. -#. +#. #. #. @@ -19951,5 +19926,5 @@ #. 50000 #. -#. +#. #. #. @@ -19959,5 +19934,5 @@ #. 50000 #. -#. +#. #. #. @@ -19967,5 +19942,5 @@ #. 50000 #. -#. +#. #. #. @@ -19975,5 +19950,5 @@ #. 50000 #. -#. +#. #. #. @@ -19983,5 +19958,5 @@ #. 50000 #. -#. +#. #. #. @@ -19991,5 +19966,5 @@ #. 50000 #. -#. +#. #. #. @@ -19999,5 +19974,5 @@ #. 50000 #. -#. +#. #. #. @@ -20007,5 +19982,5 @@ #. 50000 #. -#. +#. #. #. @@ -20015,5 +19990,5 @@ #. 50000 #. -#. +#. #. #. @@ -20023,5 +19998,5 @@ #. 50000 #. -#. +#. #. #. @@ -20031,5 +20006,5 @@ #. 50000 #. -#. +#. #. #. @@ -20039,5 +20014,5 @@ #. 50000 #. -#. +#. #. #. @@ -20047,5 +20022,5 @@ #. 50000 #. -#. +#. #. #. @@ -20055,5 +20030,5 @@ #. 50000 #. -#. +#. #. #. @@ -20063,5 +20038,5 @@ #. 50000 #. -#. +#. #. #. @@ -20071,5 +20046,5 @@ #. 50000 #. -#. +#. #. #. @@ -20079,5 +20054,5 @@ #. 50000 #. -#. +#. #. #. @@ -20087,5 +20062,5 @@ #. 50000 #. -#. +#. #. #. @@ -20095,5 +20070,5 @@ #. 50000 #. -#. +#. #. #. @@ -20103,5 +20078,5 @@ #. 50000 #. -#. +#. #. #. @@ -20111,5 +20086,5 @@ #. 50000 #. -#. +#. #. #. @@ -20119,5 +20094,5 @@ #. 50000 #. -#. +#. #. #. @@ -20127,5 +20102,5 @@ #. 50000 #. -#. +#. #. #. @@ -20135,5 +20110,5 @@ #. 50000 #. -#. +#. #. #. @@ -20143,5 +20118,5 @@ #. 50000 #. -#. +#. #. #. @@ -20151,5 +20126,5 @@ #. 50000 #. -#. +#. #. #. @@ -20159,5 +20134,5 @@ #. 50000 #. -#. +#. #. #. @@ -20167,5 +20142,5 @@ #. 50000 #. -#. +#. #. #. @@ -20175,5 +20150,5 @@ #. 50000 #. -#. +#. #. #. @@ -20183,5 +20158,5 @@ #. 50000 #. -#. +#. #. #. @@ -20191,5 +20166,5 @@ #. 50000 #. -#. +#. #. #. @@ -20199,5 +20174,5 @@ #. 50000 #. -#. +#. #. #. @@ -20207,5 +20182,5 @@ #. 50000 #. -#. +#. #. #. @@ -20215,5 +20190,5 @@ #. 50000 #. -#. +#. #. #. @@ -20223,5 +20198,5 @@ #. 50000 #. -#. +#. #. #. @@ -20231,5 +20206,5 @@ #. 50000 #. -#. +#. #. #. @@ -20239,5 +20214,5 @@ #. 50000 #. -#. +#. #. #. @@ -20247,5 +20222,5 @@ #. 50000 #. -#. +#. #. #. @@ -20255,5 +20230,5 @@ #. 50000 #. -#. +#. #. #. @@ -20263,5 +20238,5 @@ #. 50000 #. -#. +#. #. #. @@ -20271,5 +20246,5 @@ #. 50000 #. -#. +#. #. #. @@ -21963,7 +21938,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21973,5 +21948,5 @@ #. 50000 #. -#. +#. #. #. @@ -21981,5 +21956,5 @@ #. 50000 #. -#. +#. #. #. @@ -21989,5 +21964,5 @@ #. 50000 #. -#. +#. #. #. @@ -21997,5 +21972,5 @@ #. 50000 #. -#. +#. #. #. @@ -22005,5 +21980,5 @@ #. 50000 #. -#. +#. #. #. @@ -22013,5 +21988,5 @@ #. 50000 #. -#. +#. #. #. @@ -22021,5 +21996,5 @@ #. 50000 #. -#. +#. #. #. @@ -23350,5 +23325,5 @@ #. 40000 #. -#. +#. #. #. @@ -23364,5 +23339,5 @@ #. 30000 #. -#. +#. #. #. @@ -23373,7 +23348,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23383,5 +23358,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -23391,13 +23374,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -23407,5 +23382,5 @@ #. 50000 #. -#. +#. #. #. @@ -23438,5 +23413,5 @@ #. 50000 #. -#. +#. #. #. @@ -23452,5 +23427,5 @@ #. 50000 #. -#. +#. #. #. @@ -23460,5 +23435,5 @@ #. 10000 #. -#. +#. #. #. @@ -23468,5 +23443,5 @@ #. 10000 #. -#. +#. #. #. @@ -23477,5 +23452,5 @@ #. 10000 #. -#. +#. #. #. @@ -23504,5 +23479,5 @@ #. 50000 #. -#. +#. #. #. @@ -23617,9 +23592,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 @@ -23627,5 +23602,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, @@ -23635,8 +23610,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 @@ -23650,5 +23625,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23656,5 +23631,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23703,6 +23678,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23782,5 +23757,5 @@ #. 40000 #. -#. +#. #. #. @@ -23790,5 +23765,5 @@ #. 10000 #. -#. +#. #. #. @@ -23797,5 +23772,5 @@ #. 50000 #. -#. +#. #. #. @@ -23805,5 +23780,5 @@ #. 50000 #. -#. +#. #. #. @@ -23812,5 +23787,5 @@ #. 50000 #. -#. +#. #. #. @@ -23819,5 +23794,5 @@ #. 50000 #. -#. +#. #. #. @@ -23826,5 +23801,5 @@ #. 50000 #. -#. +#. #. #. @@ -23833,5 +23808,5 @@ #. 50000 #. -#. +#. #. #. @@ -23840,5 +23815,5 @@ #. 40000 #. -#. +#. #. #. @@ -23847,5 +23822,5 @@ #. 50000 #. -#. +#. #. #. @@ -23854,5 +23829,5 @@ #. 50000 #. -#. +#. #. #. @@ -23861,5 +23836,5 @@ #. 50000 #. -#. +#. #. #. @@ -23868,5 +23843,5 @@ #. 50000 #. -#. +#. #. #. @@ -23875,5 +23850,5 @@ #. 50000 #. -#. +#. #. #. @@ -23882,5 +23857,5 @@ #. 50000 #. -#. +#. #. #. @@ -23890,5 +23865,5 @@ #. 50000 #. -#. +#. #. #. @@ -23897,5 +23872,5 @@ #. 50000 #. -#. +#. #. #. @@ -23906,5 +23881,5 @@ #. 50000 #. -#. +#. #. #. @@ -23916,11 +23891,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23929,7 +23904,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23940,5 +23915,5 @@ #. 50000 #. -#. +#. #. #. @@ -23949,5 +23924,5 @@ #. 50000 #. -#. +#. #. #. @@ -23958,5 +23933,5 @@ #. 50000 #. -#. +#. #. #. @@ -23967,5 +23942,5 @@ #. 50000 #. -#. +#. #. #. @@ -23976,5 +23951,5 @@ #. 50000 #. -#. +#. #. #. @@ -23985,5 +23960,5 @@ #. 40000 #. -#. +#. #. #. @@ -23995,5 +23970,5 @@ #. 50000 #. -#. +#. #. #. @@ -24004,5 +23979,5 @@ #. 50000 #. -#. +#. #. #. @@ -24027,5 +24002,5 @@ #. 10000 #. -#. +#. #. #. @@ -24034,5 +24009,5 @@ #. 50000 #. -#. +#. #. #. @@ -24041,5 +24016,5 @@ #. 50000 #. -#. +#. #. #. @@ -24055,5 +24030,5 @@ #. 20000 #. -#. +#. #. #. @@ -24067,5 +24042,5 @@ #. 30000 #. -#. +#. #. #. @@ -24074,5 +24049,5 @@ #. 50000 #. -#. +#. #. #. @@ -24081,5 +24056,5 @@ #. 50000 #. -#. +#. #. #. @@ -24088,5 +24063,5 @@ #. 50000 #. -#. +#. #. #. @@ -24095,5 +24070,5 @@ #. 50000 #. -#. +#. #. #. @@ -24102,5 +24077,5 @@ #. 50000 #. -#. +#. #. #. @@ -24109,5 +24084,5 @@ #. 50000 #. -#. +#. #. #. @@ -24116,5 +24091,5 @@ #. 50000 #. -#. +#. #. #. @@ -24123,5 +24098,5 @@ #. 50000 #. -#. +#. #. #. @@ -24130,5 +24105,5 @@ #. 50000 #. -#. +#. #. #. @@ -24137,5 +24112,5 @@ #. 50000 #. -#. +#. #. #. @@ -24144,5 +24119,5 @@ #. 50000 #. -#. +#. #. #. @@ -24151,5 +24126,5 @@ #. 50000 #. -#. +#. #. #. @@ -24158,5 +24133,5 @@ #. 50000 #. -#. +#. #. #. @@ -24165,5 +24140,5 @@ #. 50000 #. -#. +#. #. #. @@ -24334,7 +24309,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24348,5 +24323,5 @@ #. 40000 #. -#. +#. #. #. @@ -24356,7 +24331,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24366,5 +24341,5 @@ #. 50000 #. -#. +#. #. #. @@ -24374,5 +24349,5 @@ #. 50000 #. -#. +#. #. #. @@ -24382,5 +24357,5 @@ #. 50000 #. -#. +#. #. #. @@ -24390,5 +24365,5 @@ #. 50000 #. -#. +#. #. #. @@ -24404,5 +24379,5 @@ #. 10000 #. -#. +#. #. #. @@ -24412,5 +24387,5 @@ #. 50000 #. -#. +#. #. #. @@ -24420,5 +24395,5 @@ #. 50000 #. -#. +#. #. #. @@ -24428,5 +24403,5 @@ #. 50000 #. -#. +#. #. #. @@ -24436,5 +24411,5 @@ #. 50000 #. -#. +#. #. #. @@ -24444,5 +24419,5 @@ #. 50000 #. -#. +#. #. #. @@ -24452,5 +24427,5 @@ #. 50000 #. -#. +#. #. #. @@ -24469,5 +24444,5 @@ #. 50000 #. -#. +#. #. #. @@ -24476,5 +24451,5 @@ #. 50000 #. -#. +#. #. #. @@ -24488,5 +24463,5 @@ #. 50000 #. -#. +#. #. #. @@ -24500,5 +24475,5 @@ #. 50000 #. -#. +#. #. #. @@ -24507,5 +24482,5 @@ #. 50000 #. -#. +#. #. #. @@ -24519,5 +24494,5 @@ #. 50000 #. -#. +#. #. #. @@ -24532,5 +24507,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24545,5 +24520,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24557,5 +24532,5 @@ #. 50000 #. -#. +#. #. #. @@ -24569,5 +24544,5 @@ #. 50000 #. -#. +#. #. #. @@ -24576,5 +24551,5 @@ #. 50000 #. -#. +#. #. #. @@ -24583,5 +24558,5 @@ #. 50000 #. -#. +#. #. #. @@ -24595,5 +24570,5 @@ #. 50000 #. -#. +#. #. #. @@ -24603,5 +24578,5 @@ #. 50000 #. -#. +#. #. #. @@ -24610,5 +24585,5 @@ #. 50000 #. -#. +#. #. #. @@ -24617,5 +24592,5 @@ #. 50000 #. -#. +#. #. #. @@ -24624,5 +24599,5 @@ #. 50000 #. -#. +#. #. #. @@ -24632,5 +24607,5 @@ #. 50000 #. -#. +#. #. #. @@ -24641,5 +24616,5 @@ #. 50000 #. -#. +#. #. #. @@ -24649,7 +24624,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24659,5 +24634,5 @@ #. 50000 #. -#. +#. #. #. @@ -24667,5 +24642,5 @@ #. 50000 #. -#. +#. #. #. @@ -24675,5 +24650,5 @@ #. 50000 #. -#. +#. #. #. @@ -24684,5 +24659,5 @@ #. 50000 #. -#. +#. #. #. @@ -24692,5 +24667,5 @@ #. 50000 #. -#. +#. #. #. @@ -24700,5 +24675,5 @@ #. 50000 #. -#. +#. #. #. @@ -24708,5 +24683,5 @@ #. 50000 #. -#. +#. #. #. @@ -24716,5 +24691,5 @@ #. 50000 #. -#. +#. #. #. @@ -24724,5 +24699,5 @@ #. 50000 #. -#. +#. #. #. @@ -24732,5 +24707,5 @@ #. 50000 #. -#. +#. #. #. @@ -24740,5 +24715,5 @@ #. 50000 #. -#. +#. #. #. @@ -24748,5 +24723,5 @@ #. 50000 #. -#. +#. #. #. @@ -24769,7 +24744,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24779,5 +24754,5 @@ #. 50000 #. -#. +#. #. #. @@ -24786,5 +24761,5 @@ #. 50000 #. -#. +#. #. #. @@ -24794,5 +24769,5 @@ #. 50000 #. -#. +#. #. #. @@ -24801,5 +24776,5 @@ #. 50000 #. -#. +#. #. #. @@ -24809,5 +24784,5 @@ #. 50000 #. -#. +#. #. #. @@ -24817,5 +24792,5 @@ #. 50000 #. -#. +#. #. #. @@ -24831,5 +24806,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24840,5 +24815,5 @@ #. 50000 #. -#. +#. #. #. @@ -24857,5 +24832,5 @@ #. 50000 #. -#. +#. #. #. @@ -24865,5 +24840,5 @@ #. 50000 #. -#. +#. #. #. @@ -24876,5 +24851,5 @@ #. 50000 #. -#. +#. #. #. @@ -24892,5 +24867,5 @@ #. 50000 #. -#. +#. #. #. @@ -24899,5 +24874,5 @@ #. 50000 #. -#. +#. #. #. @@ -24906,5 +24881,5 @@ #. 50000 #. -#. +#. #. #. @@ -24913,7 +24888,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24924,5 +24899,5 @@ #. 50000 #. -#. +#. #. #. @@ -24937,5 +24912,5 @@ #. 50000 #. -#. +#. #. #. @@ -24949,5 +24924,5 @@ #. 50000 #. -#. +#. #. #. @@ -24957,5 +24932,5 @@ #. 50000 #. -#. +#. #. #. @@ -24969,5 +24944,5 @@ #. 50000 #. -#. +#. #. #. @@ -24981,5 +24956,5 @@ #. 50000 #. -#. +#. #. #. @@ -24988,7 +24963,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24998,5 +24973,5 @@ #. 50000 #. -#. +#. #. #. @@ -25006,5 +24981,5 @@ #. 50000 #. -#. +#. #. #. @@ -25014,5 +24989,5 @@ #. 50000 #. -#. +#. #. #. @@ -25022,5 +24997,5 @@ #. 50000 #. -#. +#. #. #. @@ -25036,7 +25011,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25051,5 +25026,5 @@ #. 30000 #. -#. +#. #. #. @@ -25064,5 +25039,5 @@ #. 30000 #. -#. +#. #. #. @@ -25077,5 +25052,5 @@ #. 30000 #. -#. +#. #. #. @@ -25090,5 +25065,5 @@ #. 30000 #. -#. +#. #. #. @@ -25103,5 +25078,5 @@ #. 30000 #. -#. +#. #. #. @@ -25116,7 +25091,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -25126,5 +25101,5 @@ #. 50000 #. -#. +#. #. #. @@ -25133,5 +25108,5 @@ #. 50000 #. -#. +#. #. #. @@ -25141,5 +25116,5 @@ #. 50000 #. -#. +#. #. #. @@ -25149,5 +25124,5 @@ #. 50000 #. -#. +#. #. #. @@ -25157,5 +25132,5 @@ #. 50000 #. -#. +#. #. #. @@ -25165,5 +25140,5 @@ #. 50000 #. -#. +#. #. #. @@ -25173,5 +25148,5 @@ #. 50000 #. -#. +#. #. #. @@ -25181,5 +25156,5 @@ #. 50000 #. -#. +#. #. #. @@ -25189,5 +25164,5 @@ #. 50000 #. -#. +#. #. #. @@ -25197,5 +25172,5 @@ #. 50000 #. -#. +#. #. #. @@ -25205,5 +25180,5 @@ #. 50000 #. -#. +#. #. #. @@ -25213,5 +25188,5 @@ #. 50000 #. -#. +#. #. #. @@ -25221,5 +25196,5 @@ #. 50000 #. -#. +#. #. #. @@ -25239,5 +25214,5 @@ #. 50000 #. -#. +#. #. #. @@ -25252,5 +25227,5 @@ #. 50000 #. -#. +#. #. #. @@ -25263,7 +25238,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25273,5 +25248,5 @@ #. 50000 #. -#. +#. #. #. @@ -25281,5 +25256,5 @@ #. 50000 #. -#. +#. #. #. @@ -25289,5 +25264,5 @@ #. 50000 #. -#. +#. #. #. @@ -25297,5 +25272,5 @@ #. 50000 #. -#. +#. #. #. @@ -25305,5 +25280,5 @@ #. 50000 #. -#. +#. #. #. @@ -25313,5 +25288,5 @@ #. 50000 #. -#. +#. #. #. @@ -25321,5 +25296,5 @@ #. 50000 #. -#. +#. #. #. @@ -25329,5 +25304,5 @@ #. 50000 #. -#. +#. #. #. @@ -25337,5 +25312,5 @@ #. 50000 #. -#. +#. #. #. @@ -25345,5 +25320,5 @@ #. 50000 #. -#. +#. #. #. @@ -25353,5 +25328,5 @@ #. 50000 #. -#. +#. #. #. @@ -25361,5 +25336,5 @@ #. 50000 #. -#. +#. #. #. @@ -25369,5 +25344,5 @@ #. 50000 #. -#. +#. #. #. @@ -25377,5 +25352,5 @@ #. 50000 #. -#. +#. #. #. @@ -25396,5 +25371,5 @@ #. 50000 #. -#. +#. #. #. @@ -25408,7 +25383,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25418,5 +25393,5 @@ #. 50000 #. -#. +#. #. #. @@ -25426,5 +25401,5 @@ #. 50000 #. -#. +#. #. #. @@ -25434,5 +25409,5 @@ #. 50000 #. -#. +#. #. #. @@ -25442,5 +25417,5 @@ #. 50000 #. -#. +#. #. #. @@ -25450,5 +25425,5 @@ #. 50000 #. -#. +#. #. #. @@ -25458,5 +25433,5 @@ #. 50000 #. -#. +#. #. #. @@ -25466,5 +25441,5 @@ #. 50000 #. -#. +#. #. #. @@ -25481,5 +25456,5 @@ #. 50000 #. -#. +#. #. #. @@ -25489,5 +25464,5 @@ #. 50000 #. -#. +#. #. #. @@ -25497,5 +25472,5 @@ #. 50000 #. -#. +#. #. #. @@ -25505,5 +25480,5 @@ #. 50000 #. -#. +#. #. #. @@ -25513,5 +25488,5 @@ #. 50000 #. -#. +#. #. #. @@ -25521,5 +25496,5 @@ #. 50000 #. -#. +#. #. #. @@ -25529,5 +25504,5 @@ #. 50000 #. -#. +#. #. #. @@ -25537,5 +25512,5 @@ #. 50000 #. -#. +#. #. #. @@ -25545,5 +25520,5 @@ #. 50000 #. -#. +#. #. #. @@ -25553,5 +25528,5 @@ #. 50000 #. -#. +#. #. #. @@ -25561,5 +25536,5 @@ #. 50000 #. -#. +#. #. #. @@ -25569,5 +25544,5 @@ #. 50000 #. -#. +#. #. #. @@ -25586,5 +25561,5 @@ #. 50000 #. -#. +#. #. #. @@ -25594,5 +25569,5 @@ #. 50000 #. -#. +#. #. #. @@ -25601,5 +25576,5 @@ #. 50000 #. -#. +#. #. #. @@ -25609,5 +25584,5 @@ #. 50000 #. -#. +#. #. #. @@ -25617,5 +25592,5 @@ #. 50000 #. -#. +#. #. #. @@ -25625,5 +25600,5 @@ #. 50000 #. -#. +#. #. #. @@ -25632,5 +25607,5 @@ #. 50000 #. -#. +#. #. #. @@ -25640,5 +25615,5 @@ #. 50000 #. -#. +#. #. #. @@ -25648,5 +25623,5 @@ #. 50000 #. -#. +#. #. #. @@ -25656,5 +25631,5 @@ #. 50000 #. -#. +#. #. #. @@ -25664,5 +25639,5 @@ #. 50000 #. -#. +#. #. #. @@ -25671,5 +25646,5 @@ #. 50000 #. -#. +#. #. #. @@ -25678,5 +25653,5 @@ #. 50000 #. -#. +#. #. #. @@ -25685,5 +25660,5 @@ #. 50000 #. -#. +#. #. #. @@ -25692,5 +25667,5 @@ #. 50000 #. -#. +#. #. #. @@ -25699,5 +25674,5 @@ #. 50000 #. -#. +#. #. #. @@ -25706,5 +25681,5 @@ #. 50000 #. -#. +#. #. #. @@ -25713,5 +25688,5 @@ #. 50000 #. -#. +#. #. #. @@ -25720,5 +25695,5 @@ #. 50000 #. -#. +#. #. #. @@ -25727,5 +25702,5 @@ #. 50000 #. -#. +#. #. #. @@ -25734,5 +25709,5 @@ #. 50000 #. -#. +#. #. #. @@ -25741,5 +25716,5 @@ #. 50000 #. -#. +#. #. #. @@ -25748,5 +25723,5 @@ #. 50000 #. -#. +#. #. #. @@ -25755,5 +25730,5 @@ #. 50000 #. -#. +#. #. #. @@ -25763,5 +25738,5 @@ #. 50000 #. -#. +#. #. #. @@ -25771,5 +25746,5 @@ #. 50000 #. -#. +#. #. #. @@ -25779,5 +25754,5 @@ #. 50000 #. -#. +#. #. #. @@ -25787,5 +25762,5 @@ #. 50000 #. -#. +#. #. #. @@ -25795,5 +25770,5 @@ #. 50000 #. -#. +#. #. #. @@ -25803,5 +25778,5 @@ #. 50000 #. -#. +#. #. #. @@ -25811,5 +25786,5 @@ #. 50000 #. -#. +#. #. #. @@ -25819,5 +25794,5 @@ #. 50000 #. -#. +#. #. #. @@ -25827,5 +25802,5 @@ #. 50000 #. -#. +#. #. #. @@ -25836,5 +25811,5 @@ #. 50000 #. -#. +#. #. #. @@ -25844,5 +25819,5 @@ #. 50000 #. -#. +#. #. #. @@ -25852,5 +25827,5 @@ #. 50000 #. -#. +#. #. #. @@ -25860,5 +25835,5 @@ #. 50000 #. -#. +#. #. #. @@ -25868,5 +25843,5 @@ #. 50000 #. -#. +#. #. #. @@ -25876,5 +25851,5 @@ #. 50000 #. -#. +#. #. #. @@ -25884,5 +25859,5 @@ #. 50000 #. -#. +#. #. #. @@ -25892,5 +25867,5 @@ #. 50000 #. -#. +#. #. #. @@ -25900,5 +25875,5 @@ #. 50000 #. -#. +#. #. #. @@ -25908,5 +25883,5 @@ #. 50000 #. -#. +#. #. #. @@ -25916,5 +25891,5 @@ #. 50000 #. -#. +#. #. #. @@ -25924,5 +25899,5 @@ #. 50000 #. -#. +#. #. #. @@ -25932,5 +25907,5 @@ #. 50000 #. -#. +#. #. #. @@ -25940,5 +25915,5 @@ #. 50000 #. -#. +#. #. #. @@ -25948,5 +25923,5 @@ #. 50000 #. -#. +#. #. #. @@ -25956,5 +25931,5 @@ #. 50000 #. -#. +#. #. #. @@ -25964,5 +25939,5 @@ #. 50000 #. -#. +#. #. #. @@ -25972,5 +25947,5 @@ #. 50000 #. -#. +#. #. #. @@ -25980,5 +25955,5 @@ #. 50000 #. -#. +#. #. #. @@ -25987,5 +25962,5 @@ #. 50000 #. -#. +#. #. #. @@ -26017,5 +25992,5 @@ #. 50000 #. -#. +#. #. #. @@ -26025,5 +26000,5 @@ #. 50000 #. -#. +#. #. #. @@ -26033,7 +26008,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26048,5 +26023,5 @@ #. 50000 #. -#. +#. #. #. @@ -26056,5 +26031,5 @@ #. 50000 #. -#. +#. #. #. @@ -26064,5 +26039,5 @@ #. 50000 #. -#. +#. #. #. @@ -26072,5 +26047,5 @@ #. 50000 #. -#. +#. #. #. @@ -26080,5 +26055,5 @@ #. 50000 #. -#. +#. #. #. @@ -26088,5 +26063,5 @@ #. 50000 #. -#. +#. #. #. @@ -26096,5 +26071,5 @@ #. 50000 #. -#. +#. #. #. @@ -26110,7 +26085,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -26120,5 +26095,5 @@ #. 50000 #. -#. +#. #. #. @@ -26128,5 +26103,5 @@ #. 50000 #. -#. +#. #. #. @@ -26136,5 +26111,5 @@ #. 50000 #. -#. +#. #. #. @@ -26144,5 +26119,5 @@ #. 50000 #. -#. +#. #. #. @@ -26152,5 +26127,5 @@ #. 50000 #. -#. +#. #. #. @@ -26160,5 +26135,5 @@ #. 50000 #. -#. +#. #. #. @@ -26168,5 +26143,5 @@ #. 50000 #. -#. +#. #. #. @@ -26176,5 +26151,5 @@ #. 50000 #. -#. +#. #. #. @@ -26184,5 +26159,5 @@ #. 50000 #. -#. +#. #. #. @@ -26192,5 +26167,5 @@ #. 50000 #. -#. +#. #. #. @@ -26200,5 +26175,5 @@ #. 50000 #. -#. +#. #. #. @@ -26208,5 +26183,5 @@ #. 50000 #. -#. +#. #. #. @@ -26216,5 +26191,5 @@ #. 50000 #. -#. +#. #. #. @@ -26224,5 +26199,5 @@ #. 50000 #. -#. +#. #. #. @@ -26232,5 +26207,5 @@ #. 50000 #. -#. +#. #. #. @@ -26240,5 +26215,5 @@ #. 50000 #. -#. +#. #. #. @@ -26248,5 +26223,5 @@ #. 50000 #. -#. +#. #. #. @@ -26256,5 +26231,5 @@ #. 50000 #. -#. +#. #. #. @@ -26264,5 +26239,5 @@ #. 50000 #. -#. +#. #. #. @@ -26272,5 +26247,5 @@ #. 50000 #. -#. +#. #. #. @@ -26280,5 +26255,5 @@ #. 50000 #. -#. +#. #. #. @@ -26288,5 +26263,5 @@ #. 50000 #. -#. +#. #. #. @@ -26296,5 +26271,5 @@ #. 50000 #. -#. +#. #. #. @@ -26304,5 +26279,5 @@ #. 50000 #. -#. +#. #. #. @@ -26312,5 +26287,5 @@ #. 50000 #. -#. +#. #. #. @@ -26320,5 +26295,5 @@ #. 50000 #. -#. +#. #. #. @@ -26328,5 +26303,5 @@ #. 50000 #. -#. +#. #. #. @@ -26336,5 +26311,5 @@ #. 50000 #. -#. +#. #. #. @@ -26344,5 +26319,5 @@ #. 50000 #. -#. +#. #. #. @@ -26352,5 +26327,5 @@ #. 50000 #. -#. +#. #. #. @@ -26360,5 +26335,5 @@ #. 50000 #. -#. +#. #. #. @@ -26368,5 +26343,5 @@ #. 50000 #. -#. +#. #. #. @@ -26376,5 +26351,5 @@ #. 50000 #. -#. +#. #. #. @@ -26384,5 +26359,5 @@ #. 50000 #. -#. +#. #. #. @@ -26392,5 +26367,5 @@ #. 50000 #. -#. +#. #. #. @@ -26400,5 +26375,5 @@ #. 50000 #. -#. +#. #. #. @@ -26408,5 +26383,5 @@ #. 50000 #. -#. +#. #. #. @@ -26416,5 +26391,5 @@ #. 50000 #. -#. +#. #. #. @@ -26424,5 +26399,5 @@ #. 50000 #. -#. +#. #. #. @@ -26432,5 +26407,5 @@ #. 50000 #. -#. +#. #. #. @@ -26440,5 +26415,5 @@ #. 50000 #. -#. +#. #. #. @@ -26448,5 +26423,5 @@ #. 50000 #. -#. +#. #. #. @@ -26482,7 +26457,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26492,5 +26467,5 @@ #. 50000 #. -#. +#. #. #. @@ -26500,5 +26475,5 @@ #. 50000 #. -#. +#. #. #. @@ -26508,5 +26483,5 @@ #. 50000 #. -#. +#. #. #. @@ -26516,5 +26491,5 @@ #. 50000 #. -#. +#. #. #. @@ -26524,5 +26499,5 @@ #. 50000 #. -#. +#. #. #. @@ -26532,5 +26507,5 @@ #. 50000 #. -#. +#. #. #. @@ -26540,5 +26515,5 @@ #. 50000 #. -#. +#. #. #. @@ -26555,5 +26530,5 @@ #. 50000 #. -#. +#. #. #. @@ -26563,5 +26538,5 @@ #. 50000 #. -#. +#. #. #. @@ -26571,5 +26546,5 @@ #. 50000 #. -#. +#. #. #. @@ -26579,5 +26554,5 @@ #. 50000 #. -#. +#. #. #. @@ -26587,5 +26562,5 @@ #. 50000 #. -#. +#. #. #. @@ -26595,5 +26570,5 @@ #. 50000 #. -#. +#. #. #. @@ -26604,5 +26579,5 @@ #. 50000 #. -#. +#. #. #. @@ -26612,5 +26587,5 @@ #. 50000 #. -#. +#. #. #. @@ -26620,5 +26595,5 @@ #. 40000 #. -#. +#. #. #. @@ -26628,5 +26603,5 @@ #. 50000 #. -#. +#. #. #. @@ -26635,5 +26610,5 @@ #. 40000 #. -#. +#. #. #. @@ -26642,5 +26617,5 @@ #. 40000 #. -#. +#. #. #. @@ -26658,7 +26633,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26668,5 +26643,5 @@ #. 50000 #. -#. +#. #. #. @@ -26676,5 +26651,5 @@ #. 50000 #. -#. +#. #. #. @@ -26684,5 +26659,5 @@ #. 50000 #. -#. +#. #. #. @@ -26692,5 +26667,5 @@ #. 50000 #. -#. +#. #. #. @@ -26700,5 +26675,5 @@ #. 50000 #. -#. +#. #. #. @@ -26708,5 +26683,5 @@ #. 50000 #. -#. +#. #. #. @@ -26716,5 +26691,5 @@ #. 50000 #. -#. +#. #. #. @@ -26724,5 +26699,5 @@ #. 50000 #. -#. +#. #. #. @@ -26732,5 +26707,5 @@ #. 50000 #. -#. +#. #. #. @@ -26749,5 +26724,5 @@ #. 50000 #. -#. +#. #. #. @@ -26761,5 +26736,5 @@ #. 50000 #. -#. +#. #. #. @@ -26773,5 +26748,5 @@ #. 50000 #. -#. +#. #. #. @@ -26781,5 +26756,5 @@ #. 50000 #. -#. +#. #. #. @@ -26793,5 +26768,5 @@ #. 50000 #. -#. +#. #. #. @@ -26805,5 +26780,5 @@ #. 50000 #. -#. +#. #. #. @@ -26817,6 +26792,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26826,5 +26801,5 @@ #. 50000 #. -#. +#. #. #. @@ -26838,5 +26813,5 @@ #. 50000 #. -#. +#. #. #. @@ -26850,5 +26825,5 @@ #. 50000 #. -#. +#. #. #. @@ -26862,5 +26837,5 @@ #. 50000 #. -#. +#. #. #. @@ -26874,5 +26849,5 @@ #. 50000 #. -#. +#. #. #. @@ -26886,5 +26861,5 @@ #. 50000 #. -#. +#. #. #. @@ -26894,7 +26869,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26904,5 +26879,5 @@ #. 50000 #. -#. +#. #. #. @@ -26912,5 +26887,5 @@ #. 50000 #. -#. +#. #. #. @@ -26920,5 +26895,5 @@ #. 50000 #. -#. +#. #. #. @@ -26928,5 +26903,5 @@ #. 50000 #. -#. +#. #. #. @@ -26943,5 +26918,5 @@ #. 50000 #. -#. +#. #. #. @@ -26954,5 +26929,5 @@ #. 50000 #. -#. +#. #. #. @@ -26966,5 +26941,5 @@ #. 50000 #. -#. +#. #. #. @@ -26978,5 +26953,5 @@ #. 50000 #. -#. +#. #. #. @@ -26990,5 +26965,5 @@ #. 50000 #. -#. +#. #. #. @@ -26999,5 +26974,5 @@ #. 50000 #. -#. +#. #. #. @@ -27007,5 +26982,5 @@ #. 50000 #. -#. +#. #. #. @@ -27015,5 +26990,5 @@ #. 50000 #. -#. +#. #. #. @@ -27023,5 +26998,5 @@ #. 50000 #. -#. +#. #. #. @@ -27031,5 +27006,5 @@ #. 50000 #. -#. +#. #. #. @@ -27046,5 +27021,5 @@ #. 50000 #. -#. +#. #. #. @@ -27058,5 +27033,5 @@ #. 50000 #. -#. +#. #. #. @@ -27070,5 +27045,5 @@ #. 50000 #. -#. +#. #. #. @@ -27082,5 +27057,5 @@ #. 50000 #. -#. +#. #. #. @@ -27094,5 +27069,5 @@ #. 50000 #. -#. +#. #. #. @@ -27106,5 +27081,5 @@ #. 50000 #. -#. +#. #. #. @@ -27113,7 +27088,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27123,5 +27098,5 @@ #. 50000 #. -#. +#. #. #. @@ -27131,5 +27106,5 @@ #. 50000 #. -#. +#. #. #. @@ -27139,5 +27114,5 @@ #. 50000 #. -#. +#. #. #. @@ -27147,5 +27122,5 @@ #. 50000 #. -#. +#. #. #. @@ -27155,5 +27130,5 @@ #. 50000 #. -#. +#. #. #. @@ -27163,5 +27138,5 @@ #. 50000 #. -#. +#. #. #. @@ -27171,5 +27146,5 @@ #. 50000 #. -#. +#. #. #. @@ -27186,7 +27161,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27196,5 +27171,5 @@ #. 50000 #. -#. +#. #. #. @@ -27204,5 +27179,5 @@ #. 50000 #. -#. +#. #. #. @@ -27212,5 +27187,5 @@ #. 50000 #. -#. +#. #. #. @@ -27220,5 +27195,5 @@ #. 50000 #. -#. +#. #. #. @@ -27234,5 +27209,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -27281,5 +27256,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27289,5 +27264,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27297,5 +27272,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27305,5 +27280,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27313,5 +27288,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27321,5 +27296,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27329,5 +27304,5 @@ #. 50000 #. -#. +#. #. #. @@ -27337,5 +27312,5 @@ #. 50000 #. -#. +#. #. #. @@ -27345,5 +27320,5 @@ #. 50000 #. -#. +#. #. #. @@ -27353,5 +27328,5 @@ #. 50000 #. -#. +#. #. #. @@ -27361,5 +27336,5 @@ #. 50000 #. -#. +#. #. #. @@ -27369,5 +27344,5 @@ #. 50000 #. -#. +#. #. #. @@ -27387,5 +27362,5 @@ #. 50000 #. -#. +#. #. #. @@ -27394,5 +27369,5 @@ #. 50000 #. -#. +#. #. #. @@ -27401,5 +27376,5 @@ #. 50000 #. -#. +#. #. #. @@ -27408,5 +27383,5 @@ #. 40000 #. -#. +#. #. #. @@ -27415,5 +27390,5 @@ #. 40000 #. -#. +#. #. #. @@ -27422,5 +27397,5 @@ #. 40000 #. -#. +#. #. #. @@ -27515,5 +27490,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -27521,28 +27496,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 @@ -27657,5 +27632,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27668,5 +27643,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27691,6 +27666,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27699,6 +27674,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27713,6 +27688,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 @@ -27726,6 +27701,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 @@ -27745,6 +27720,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27768,6 +27743,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 @@ -27780,4 +27755,104 @@ msgstr "Sicile - Italie" +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Impossible d’annuler la commande \"{0}\" car le calque \"{1}\" n’est plus " +#~ "présent." + +#~ msgid "Download all incomplete ways and nodes in relation" +#~ msgstr "" +#~ "Télécharger tous les chemins et les nœuds incomplets dans la relation" + +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Permettre l'envoi de tous les changements en une requête, désactivez pour " +#~ "utiliser une requête par primitive modifiée" + +#~ msgid "Images for {0}" +#~ msgstr "Images pour {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Lecture GPX..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Aucune heure pour le point {0}·x·{1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Aucune image avec des informations horaires lisibles trouvée." + +#~ msgid "GPS start: {0}" +#~ msgstr "Allumage du GPS : {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "Extinction du GPS : {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "variation différentielle actuelle : {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "différence de fuseau horaire : " + +#~ msgid "{0} within the track." +#~ msgstr "{0} dans la trace." + +#~ msgid "Sync clock" +#~ msgstr "Synchroniser l’horloge" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "La date du fichier \"{0}\" n'a pas pu être analysée." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"." + +#~ msgid "Image" +#~ msgstr "Image" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synchroniser l’heure avec l’instrument GPS" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "La date indiquée ne peut être analysée." + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "" +#~ "Le chargement du greffon {0} a été demandé. Ce greffon n'est plus " +#~ "nécessaire." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Images géoétiquettées" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Ouvrir les images avec AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "options osmarender" + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Un autre greffon de géo-marquage pour JOSM. Corrèle des photos avec des " +#~ "traces GPS, ou importe des photos géo-marquées." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Quelques utilitaires qui vous rendent la vie plus facile : par ex. " +#~ "simplifier un chemin, joindre des aires, aller à une position." + #~ msgid "Move" #~ msgstr "Déplacer" @@ -27810,5 +27885,4 @@ #~ msgstr "Objet" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27843,5 +27917,4 @@ #~ msgstr "faux" -#, java-format #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "Résoudre {0} conflits dans {1} objets" @@ -27853,5 +27926,4 @@ #~ msgstr "sans-nom" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Erreur durant le chargement de la page {0}" @@ -27867,6 +27939,6 @@ #~ "about the problem." #~ msgstr "" -#~ "Le greffon ne peut pas être supprimé. Merci de le signaler là où vous avez " -#~ "obtenu JOSM." +#~ "Le greffon ne peut pas être supprimé. Merci de le signaler là où vous " +#~ "avez obtenu JOSM." #~ msgid "Occupied By" @@ -27892,5 +27964,4 @@ #~ msgstr "Montrer le status de la dalle" -#, java-format #~ msgid "requested: {0}" #~ msgstr "demandé : {0}" @@ -27899,5 +27970,4 @@ #~ msgstr "Metacarta Map Rectifier image id" -#, java-format #~ msgid "rectifier id={0}" #~ msgstr "rectifier id={0}" @@ -27921,5 +27991,4 @@ #~ msgstr "YAHOO (WebKit GTK)" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}." @@ -27933,6 +28002,6 @@ #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "" -#~ "Indication : Certains changements viennent de l’envoi de nouvelles données " -#~ "sur le serveur." +#~ "Indication : Certains changements viennent de l’envoi de nouvelles " +#~ "données sur le serveur." #~ msgid "Tags (empty value deletes tag)" @@ -27944,9 +28013,10 @@ #~ msgid "Can only edit help pages from JOSM Online Help" #~ msgstr "" -#~ "Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de JOSM" +#~ "Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de " +#~ "JOSM" #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" #~ "Les chemins sélectionnés ne sont pas les mêmes membres d’une relation. " @@ -27963,5 +28033,4 @@ #~ msgstr "Le transfert a été interrompu sur erreur (attente de 5 secondes) :" -#, java-format #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." @@ -27969,5 +28038,4 @@ #~ msgstr[1] "{0} Greffons mis à jour avec succès. Veuillez redémarrer JOSM." -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Impossible de télécharger le greffon : {0} de {1}" @@ -27978,8 +28046,4 @@ #~ msgid "Rotate" #~ msgstr "Pivoter" - -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Supprimer {1} {0}" #~ msgid "Conflicting relation" @@ -27991,6 +28055,6 @@ #~ msgstr "" #~ "(Vous pouvez changer le nombre de jours au bout duquel cet avertissement " -#~ "s'affiche
en modifiant l'option de configuration " -#~ "'pluginmanager.warntime'.)" +#~ "s'affiche
en modifiant l'option de configuration 'pluginmanager." +#~ "warntime'.)" #~ msgid "Be sure to include the following information:" @@ -28073,6 +28137,6 @@ #~ msgid "Include your steps to get to the error (as detailed as possible)!" #~ msgstr "" -#~ "Indiquer la procédure effectuée pour arriver à cette erreur (aussi détaillée " -#~ "que possible) !" +#~ "Indiquer la procédure effectuée pour arriver à cette erreur (aussi " +#~ "détaillée que possible) !" #~ msgid "Server does not support changesets" @@ -28083,18 +28147,19 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" -#~ "Essayez d'utiliser la dernière version de JOSM et de ses greffons avant de " -#~ "rapporter un bogue." +#~ "Essayez d'utiliser la dernière version de JOSM et de ses greffons avant " +#~ "de rapporter un bogue." #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" -#~ "ATTENTION : Le mot de passe est stocké en texte brut dans le fichier " -#~ "de préférences.
Le mot de passe est transféré en texte brut au serveur, " -#~ "encodé dans l’URL.
N’utilisez pas un mot de passe de valeur." +#~ "ATTENTION : Le mot de passe est stocké en texte brut dans le " +#~ "fichier de préférences.
Le mot de passe est transféré en texte brut au " +#~ "serveur, encodé dans l’URL.
N’utilisez pas un mot de passe de " +#~ "valeur." #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" @@ -28102,6 +28167,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -28118,6 +28183,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example,replacing 73 with your image id: \n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28127,8 +28192,9 @@ #~ msgstr "" #~ "Vous pouvez ajouter, éditer et supprimer des sources WMS dans l'onglet " -#~ "Préférences du greffon WMS - elles apparaitront ensuite dans le menu WMS.\n" +#~ "Préférences du greffon WMS - elles apparaitront ensuite dans le menu " +#~ "WMS.\n" #~ "\n" -#~ "Vous pouvez également faire cela manuellement dans les Préférences avancées, " -#~ "en utilisant le schéma suivant :\n" +#~ "Vous pouvez également faire cela manuellement dans les Préférences " +#~ "avancées, en utilisant le schéma suivant :\n" #~ "wmsplugin.url.1.name=Landsat\n" #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" @@ -28161,9 +28227,9 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Les nœuds sélectionnés ne sont pas les mêmes membres d’une relation. Voulez-" -#~ "vous encore les fusionner ?" +#~ "Les nœuds sélectionnés ne sont pas les mêmes membres d’une relation. " +#~ "Voulez-vous encore les fusionner ?" #~ msgid "Only two nodes allowed" @@ -28177,5 +28243,4 @@ #~ "Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}" @@ -28209,12 +28274,11 @@ #~ msgstr "Afficher la liste des auteurs" -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" #~ "Le greffon {0} semble endommagé ou n'a pas pu être téléchargé " #~ "automatiquement." -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28233,5 +28297,4 @@ #~ msgstr "Chargement vers OSM..." -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -28240,14 +28303,12 @@ #~ "{0}" #~ msgstr "" -#~ "L'archive du greffon a déjà été téléchargée. Souhiatez-vous télécharger la " -#~ "version actuelle en supprimant l'archive existante?\n" +#~ "L'archive du greffon a déjà été téléchargée. Souhiatez-vous télécharger " +#~ "la version actuelle en supprimant l'archive existante?\n" #~ "\n" #~ "{0}" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Auteurs : {0}" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Conflits : {0}" @@ -28266,5 +28327,4 @@ #~ msgstr "Ouvrir dans le navigateur" -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Chemin ignoré car il contient un nœud inexistant : {0}\n" @@ -28278,8 +28338,4 @@ #~ msgstr "Le greffon est déjà installé" -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Impossible de supprimer le fichier du greffon : {0}" - #~ msgid "sports" #~ msgstr "Magasin de sport" @@ -28296,6 +28352,6 @@ #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" #~ msgstr "" -#~ "Sélectionner manuellement la zone Lambert (i.e. pour les localisations entre " -#~ "deux zones)" +#~ "Sélectionner manuellement la zone Lambert (i.e. pour les localisations " +#~ "entre deux zones)" #~ msgid "Select Tableau d'Assemblage" @@ -28308,8 +28364,9 @@ #~ msgstr "Fichier tampon de la zone Lambert 3 (.3)" -#, java-format -#~ msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" #~ msgstr "" -#~ "Zine Lambert {0} du tampon incompatible avec la zone de Lambert courante {1}" +#~ "Zine Lambert {0} du tampon incompatible avec la zone de Lambert courante " +#~ "{1}" #~ msgid "" @@ -28317,6 +28374,6 @@ #~ "some time." #~ msgstr "" -#~ "Le serveur a retourné une erreur. Essayez de réduire la taille de la zone à " -#~ "charger, et/ou attendez un peu avant de recommencer." +#~ "Le serveur a retourné une erreur. Essayez de réduire la taille de la zone " +#~ "à charger, et/ou attendez un peu avant de recommencer." #~ msgid "Remove Selected" @@ -28343,5 +28400,4 @@ #~ msgstr "Continuer tout de même" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Veuillez rapporter un billet à {0}" @@ -28378,6 +28434,6 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" #~ "Rétablir l’état des objets actuellement sélectionnés à la version " @@ -28387,5 +28443,4 @@ #~ msgstr "Supprimer le calque" -#, java-format #~ msgid "Layers: {0}" #~ msgstr "Calques: {0}" @@ -28420,6 +28475,6 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" #~ "Erreur interne : impossible de vérifier les conditions pour aucun calque. " @@ -28438,5 +28493,4 @@ #~ msgstr "Déplacer vers le bas" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Editeur de relation : {0}" @@ -28445,5 +28499,4 @@ #~ msgstr "Déplacer vers le haut" -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "Changez auparavant la projection en {0}" @@ -28452,5 +28505,4 @@ #~ msgstr "Projection invalide" -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -28468,9 +28520,9 @@ #~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You can " -#~ "adjust the sliders to manually match the photos." +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." #~ msgstr "" -#~ "Une erreur est survenue lors de l'association des photos avec la trace GPX. " -#~ "Vous pouvez ajuster les curseurs pour faire correspondre les photos " +#~ "Une erreur est survenue lors de l'association des photos avec la trace " +#~ "GPX. Vous pouvez ajuster les curseurs pour faire correspondre les photos " #~ "manuellement." @@ -28494,9 +28546,7 @@ #~ msgstr "Modifier une herse" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Utiliser la balise \"{0}\" du groupe \"{1}\"" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Utiliser la balise \"{0}\"" @@ -28512,7 +28562,7 @@ #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." #~ msgstr "" -#~ "Les sources (URL ou nom de fichier) des fichiers de définitions des balises " -#~ "prédéfinies. Voir http://josm.openstreetmap.de/wiki/TaggingPresets pour plus " -#~ "d'informations" +#~ "Les sources (URL ou nom de fichier) des fichiers de définitions des " +#~ "balises prédéfinies. Voir http://josm.openstreetmap.de/wiki/" +#~ "TaggingPresets pour plus d'informations" #~ msgid "Add a new tagging preset source to the list." @@ -28520,10 +28570,10 @@ #~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to selected " -#~ "user, opens browser showing selected author profile page." +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." #~ msgstr "" -#~ "Outil pour travailler avec les auteurs/utilisateurs. Sélectionnez une donnée " -#~ "de l'utilisateur sur la carte pour ouvrir un navigateur affichant la page du " -#~ "profil de l'auteur." +#~ "Outil pour travailler avec les auteurs/utilisateurs. Sélectionnez une " +#~ "donnée de l'utilisateur sur la carte pour ouvrir un navigateur affichant " +#~ "la page du profil de l'auteur." #~ msgid "Directly load TCX files from JOSM." @@ -28532,11 +28582,11 @@ #~ msgid "" #~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to OSM " -#~ "eg. deleting uninteresting parts of track." +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." #~ msgstr "" -#~ "La principale fonction du greffon est de permettre la suppression de points " -#~ "de la trace GPX. Ce greffon peut être utilisé pour préparer des traces à " -#~ "être chargées vers OSM, par ex. en supprimant des parties inintéressantes " -#~ "des traces." +#~ "La principale fonction du greffon est de permettre la suppression de " +#~ "points de la trace GPX. Ce greffon peut être utilisé pour préparer des " +#~ "traces à être chargées vers OSM, par ex. en supprimant des parties " +#~ "inintéressantes des traces." #~ msgid "Combine Anyway" @@ -28558,5 +28608,4 @@ #~ msgstr "Erreur lors du traitement de la réponse au changement envoyé" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28570,5 +28619,6 @@ #~ "les latitudes entre 45.7° et 47.9°\n" #~ "et les longitutes entre 5.7° et 10.6° uniquement.\n" -#~ "Veuillez utiliser un autre système de projection si vous ne travaillez pas\n" +#~ "Veuillez utiliser un autre système de projection si vous ne travaillez " +#~ "pas\n" #~ "sur des données de Suisse ou du Liechtenstein.\n" #~ "Ne pas envoyer de données après ce message." @@ -28583,15 +28633,12 @@ #~ msgstr "% de lon. :" -#, java-format #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "L’image dont le chemin est {0} n'existe pas ou est illisible." -#, java-format #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." #~ msgstr "" -#~ "Donnée invalide de l’attribut \"type\" sur le membre {0} de la relation {1}, " -#~ "valeur {2}" - -#, java-format +#~ "Donnée invalide de l’attribut \"type\" sur le membre {0} de la relation " +#~ "{1}, valeur {2}" + #~ msgid "Resolve conflicts in member list of of relation {0}" #~ msgstr "Résoudre les conflits dans la liste des membres de la relation {0}" @@ -28623,5 +28670,4 @@ #~ msgstr "Intersection atteinte" -#, java-format #~ msgid "Checking whether node {0} is gone ..." #~ msgstr "Vérification si le nœud {0} est supprimé..." @@ -28636,30 +28682,30 @@ #~ msgstr "La mise à jour a échoué" -#, java-format #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Vérification si la primitive {0} est supprimée..." -#, java-format #~ msgid "" -#~ "The OSM primitive with id {0} has been deleted
on " -#~ "the server by another mapper.

Click {1} to keep your " -#~ "primitive and ignore the deleted state.
Your primitive will be assigend a " -#~ "new id.
Click {2} to accept the state on the server and " -#~ "to delete your primitive.
Click {3} to cancel.
" +#~ "The OSM primitive with id {0} has been " +#~ "deleted
on the server by another mapper.

Click {1} to keep your primitive and ignore the deleted state.
Your " +#~ "primitive will be assigend a new id.
Click {2} to " +#~ "accept the state on the server and to delete your primitive.
Click " +#~ "{3} to cancel.
" #~ msgstr "" -#~ "La primitive OSM d’id {0} a été supprimée
sur le " -#~ "serveur par un autre utilisateur.

Cliquez {1} pour " -#~ "garder votre primitive et ignorer l’état supprimé.
Votre primitive " -#~ "obtiendra un nouvel id.
Cliquez {2} pour accepter l’état " -#~ "du serveur et supprimer votre primitive.
Cliquez {3} " -#~ "pour annuler.
" - -#, java-format +#~ "La primitive OSM d’id {0} a été supprimée
sur " +#~ "le serveur par un autre utilisateur.

Cliquez {1} " +#~ "pour garder votre primitive et ignorer l’état supprimé.
Votre " +#~ "primitive obtiendra un nouvel id.
Cliquez {2} pour " +#~ "accepter l’état du serveur et supprimer votre primitive.
Cliquez " +#~ "{3} pour annuler.
" + #~ msgid "" -#~ "There are {0} primitives
selected for individual " -#~ "update. Please reduce the selection
to max. {1} primitives." +#~ "There are {0} primitives
selected for " +#~ "individual update. Please reduce the selection
to max. {1} primitives." +#~ "" #~ msgstr "" -#~ "Il y a {0} primitives
sélectionnées pour mise à " -#~ "jour. Veuillez réduire la sélection
à un maximum de {1} primitives." +#~ "Il y a {0} primitives
sélectionnées pour mise " +#~ "à jour. Veuillez réduire la sélection
à un maximum de {1} primitives." #~ msgid "Selection too big" @@ -28696,5 +28742,4 @@ #~ msgstr "Suppression d’une primitive" -#, java-format #~ msgid "" #~ "Uploading failed because a primitive you tried " @@ -28714,6 +28759,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -28729,6 +28774,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example, replacing 73 with your image id:\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28737,6 +28782,7 @@ #~ "use." #~ msgstr "" -#~ "Vous pouvez ajouter, éditer et supprimer des entrées WMS dans l’onglet des " -#~ "préférences de WMSplugin - ces options s’afficheront dans le menu WMS.\n" +#~ "Vous pouvez ajouter, éditer et supprimer des entrées WMS dans l’onglet " +#~ "des préférences de WMSplugin - ces options s’afficheront dans le menu " +#~ "WMS.\n" #~ "\n" #~ "Vous pouvez également effectuer ceci dans les Préférences Avancées, en " @@ -28750,7 +28796,6 @@ #~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" #~ "\n" -#~ "Pour le Rectificateur de Carte Metacarta " -#~ "http://labs.metacarta.com/rectifier/ , vous avez seulement besoin d’entrer " -#~ "le bon ’id’.\n" +#~ "Pour le Rectificateur de Carte Metacarta http://labs.metacarta.com/" +#~ "rectifier/ , vous avez seulement besoin d’entrer le bon ’id’.\n" #~ "Pour ajouter l'entrée de menu du Rectificateur de Carte Metacarta, créez " #~ "manuellement l'URL comme dans cet exemple, en remplaçant 73 par l’id de " @@ -28759,13 +28804,13 @@ #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" #~ "\n" -#~ "Note : veuillez vous assurer que l'image est utilisable, notamment au niveau " -#~ "du copyright, dans le doute, ne l'utilisez pas." - -#, java-format +#~ "Note : veuillez vous assurer que l'image est utilisable, notamment au " +#~ "niveau du copyright, dans le doute, ne l'utilisez pas." + #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" #~ msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\"" #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" #~ "Aucune donnée à mettre à jour trouvée. Avez-vous ouvert ou téléchargé une " @@ -28778,5 +28823,4 @@ #~ msgstr "Échec d’initialisation de l’API" -#, java-format #~ msgid "removing reference from way {0}" #~ msgstr "suppression de la référence du chemin {0}" @@ -28791,5 +28835,4 @@ #~ msgstr "conflit créé" -#, java-format #~ msgid "Remove relation member {0} {1}" #~ msgstr "supprimer le membre de la relation {0} {1}" @@ -28818,5 +28861,4 @@ #~ msgstr "Impossible de rechercher car il n’y a pas de données chargées." -#, java-format #~ msgid "Do you really want to delete layer ''{0}''?" #~ msgstr "Voulez-vous vraiment effacer la couche''{0}''?" @@ -28829,8 +28871,7 @@ #~ "found." #~ msgstr "" -#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont été " -#~ "trouvés." - -#, java-format +#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont " +#~ "été trouvés." + #~ msgid "" #~ "There are unsaved changes in {0} layer. Discard the changes and continue?" @@ -28848,53 +28889,47 @@ #~ msgid "" -#~ "Select to upload the data using a new changeset and to leave the changeset " -#~ "open after the upload" +#~ "Select to upload the data using a new changeset and to leave the " +#~ "changeset open after the upload" #~ msgstr "" #~ "Choisir pour envoyer les données en utilisant un nouvel ensemble de " #~ "changements et pour le laisser ouvert après l'envoi" -#, java-format #~ msgid "" #~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " #~ "relation?" #~ msgstr "" -#~ "La sélection \"{0}\" est utilisée par la relation \"{1}\".
Enlever " -#~ "de la relation ?" - -#, java-format +#~ "La sélection \"{0}\" est utilisée par la relation \"{1}\"." +#~ "
Enlever de la relation ?" + #~ msgid "" -#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " -#~ "from relation?" +#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." +#~ "
Delete from relation?" #~ msgstr "" -#~ "La sélection \"{0}\" est utilisée par la relation \"{1}\" avec le rôle " -#~ "{2}.
Enlever de la relation ?" - -#, java-format +#~ "La sélection \"{0}\" est utilisée par la relation \"{1}\" avec le " +#~ "rôle {2}.
Enlever de la relation ?" + #~ msgid "" #~ "Select to upload to the existing changeset {0} and to leave the changeset " #~ "open for further uploads" #~ msgstr "" -#~ "Envoyer avec la session de modification existante {0} et la laisser ouverte " -#~ "pour d'autres envois." - -#, java-format +#~ "Envoyer avec la session de modification existante {0} et la laisser " +#~ "ouverte pour d'autres envois." + #~ msgid "Use the existing changeset {0} and close it after upload" #~ msgstr "" -#~ "Utiliser la session de modification existante {0} et la fermer après l'envoi." - -#, java-format +#~ "Utiliser la session de modification existante {0} et la fermer après " +#~ "l'envoi." + #~ msgid "" #~ "Select to upload to the existing changeset {0} and to close the changeset " #~ "after this upload" #~ msgstr "" -#~ "Envoyer avec la session de modification existante {0} et la fermer après cet " -#~ "envoi." - -#, java-format +#~ "Envoyer avec la session de modification existante {0} et la fermer après " +#~ "cet envoi." + #~ msgid "Use the existing changeset {0} and leave it open" #~ msgstr "" #~ "Utiliser la session de modification existante {0} et la conserver ouverte." -#, java-format #~ msgid "paramete''{0}'' must not be null" #~ msgstr "Le paramètre \"{0}\" ne doit pas être nul." @@ -28906,12 +28941,10 @@ #~ msgstr "Remplacer" -#, java-format #~ msgid "Help page missing. Create it in English." #~ msgstr "Page d’aide manquante. Créez-la en français." -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" #~ "Page d’aide manquante. Créez-la en français ou English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" #~ "Page d’aide manquante. Créez la sur English ou French." -#, java-format #~ msgid "" #~ "WARNING: launching browser windows for the first {0} of {1} selected " @@ -28939,5 +28971,4 @@ #~ "primitives sélectionnées uniquement." -#, java-format #~ msgid "Unexpected return value. Got {0}." #~ msgstr "valeur inattendue retournée. Reçue {0}" @@ -28956,5 +28987,4 @@ #~ msgstr "pas de version plus récente trouvée. L’historique est vide." -#, java-format #~ msgid "Index out of bounds. Got {0}." #~ msgstr "index en dehors des limites. Reçu {0}" @@ -28963,27 +28993,22 @@ #~ msgstr "Afficher l'historique de la primitive sélectionnée" -#, java-format #~ msgid "" #~ "Hailed to set reference. Reference ID {0} does not match history ID {1}." #~ msgstr "" -#~ "impossible de définir la référence. la référence d’id {0} ne correspond pas " -#~ "à l'historique d’id {1}" - -#, java-format +#~ "impossible de définir la référence. la référence d’id {0} ne correspond " +#~ "pas à l'historique d’id {1}" + #~ msgid "" #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." #~ msgstr "" -#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu " -#~ "\"{1}\"" - -#, java-format +#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, " +#~ "reçu \"{1}\"" + #~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''." +#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " +#~ "''{1}''." #~ msgstr "" -#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int (>=0), " -#~ "reçu \"{1}\"" - -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Veuillez d’abord saisir les coordonnées désirées." +#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int " +#~ "(>=0), reçu \"{1}\"" #~ msgid "No type found. History is empty." Index: /applications/editors/josm/i18n/po/gl.po =================================================================== --- /applications/editors/josm/i18n/po/gl.po (revision 18974) +++ /applications/editors/josm/i18n/po/gl.po (revision 18975) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 16:20+0100\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" "PO-Revision-Date: 2009-09-22 15:04+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\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" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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" @@ -116,5 +115,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 @@ -137,9 +136,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 @@ -155,20 +154,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 @@ -187,7 +182,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 "Erro" @@ -267,5 +262,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 "Engadidos" @@ -306,4 +301,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 @@ -311,8 +308,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 @@ -322,29 +319,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 @@ -373,6 +368,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 "" @@ -424,14 +419,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 "Latitude" #: ../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 "Lonxitude" @@ -457,10 +452,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 @@ -491,19 +486,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 @@ -512,9 +510,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 @@ -530,7 +525,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 @@ -542,11 +537,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" @@ -634,5 +629,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}" @@ -687,10 +682,10 @@ "serie de nodos)" -#: ../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 "Combinar {0} vías" -#: ../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 "Por favor, selecciona polo menos dúas vías para combinar." @@ -709,19 +704,19 @@ msgstr "Por favor, selecciona algo para copiar" +#: ../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 "Crear Círculo" -#: ../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 "Crear un círculo a partir de tres nodos seleccionados." -#: ../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 " @@ -732,9 +727,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 @@ -807,21 +802,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" @@ -829,6 +828,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 @@ -857,5 +856,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 "Duplicar" @@ -912,8 +911,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 @@ -921,5 +918,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 @@ -932,8 +929,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 @@ -952,8 +949,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 @@ -976,13 +973,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 @@ -1022,4 +1020,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 "Introducir valores para todos os conflitos." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Resolver Conflitos" + +#: ../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 @@ -1039,4 +1133,45 @@ msgstr "Sen Atallo" +#: ../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" @@ -1047,26 +1182,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 "Acoplar Nodos" -#: ../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 "Acoplar nodos no máis antigo" -#: ../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 "Por favor, selecciona polo menos dous nodos a acoplar." -#: ../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 "" @@ -1074,5 +1209,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" @@ -1449,6 +1584,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 "" "Amosar informe de estado con información de utilidade que poida ser engadida " @@ -1470,9 +1604,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 "Pechar" + +#: ../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 @@ -1601,6 +1767,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 "" "* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou" @@ -1684,54 +1849,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 "Actualizar Selección" +#: ../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 "Selección valeira" -#: ../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 "" @@ -1740,35 +1905,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 "Non hai cambios que subir." -#: ../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 "Nada que subir. Consigue algún dato antes." -#: ../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 "Sincronizar o paquete de datos completo" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1776,9 +1941,8 @@ "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.
" +"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 "" "A actualización fallou porque o servidor ten unha " @@ -1791,18 +1955,17 @@ "continuar editando.
" -#: ../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 +#: ../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.
" +"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 "" "A subida fallou porque o servidor tiña unha versión " @@ -1812,5 +1975,5 @@ "editando.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1820,22 +1983,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 "" @@ -1846,15 +2009,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 "Actualizando primitiva" @@ -1866,6 +2029,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 "" @@ -1874,38 +2037,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 "" @@ -2069,6 +2231,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 "" @@ -2137,38 +2299,38 @@ msgstr "seleccionado" -#: ../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 "Non se pode engadir un nodo fora do mundo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Engadir nodo" -#: ../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 "Engadir nodo na vía" -#: ../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 "Conectar via existente a nodo" -#: ../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 "Engadir un novo nodo a unha via existente" -#: ../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 "Engadir nodo a vía e conectar" -#: ../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 "Crear novo nodo." -#: ../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 "Seleccionar nodo baixo o cursor." -#: ../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." @@ -2177,14 +2339,14 @@ msgstr[1] "Insertar novo nodo en {0} vías." -#: ../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 "Comezar nova vía a partir do último nodo." -#: ../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 "Continuar vía a partir do último nodo." -#: ../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 "Rematar debuxo." @@ -2220,6 +2382,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 "" "Arrastrar cabezal de reproducción e soltar preto da pista para reproducir o " @@ -2308,6 +2470,6 @@ "move zoom with right button" msgstr "" -"Facer zoom arrastrando ou con [ Ctrl+. ] ou [ Ctrl+, ]; mover con " -"Ctrl+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito" +"Facer zoom arrastrando ou con [ Ctrl+. ] ou [ Ctrl+, ]; mover con Ctrl" +"+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 @@ -2322,5 +2484,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." @@ -2380,6 +2542,6 @@ "type=, *=*, *=" msgstr "" -"type=* - a clave 'type' con calquer valor. Proba tamén " -"*=value, type=, *=*, *=" +"type=* - a clave 'type' con calquer valor. Proba tamén *=value, type=, *=*, *=" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 @@ -2398,6 +2560,5 @@ msgid "" "type: - type of the object (node, way, relation)" -msgstr "" -"type: - tipo do obxecto(node,way,relation)" +msgstr "type: - tipo do obxecto(node,way,relation)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 @@ -2406,12 +2567,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - todos os obxectos cambiados polo usuario" + +#: ../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 "nodes:... - obxectro có número de nodos indicado" -#: ../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-" @@ -2419,21 +2585,21 @@ 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 "modified - todos os obxectos cambiados" -#: ../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 "selected - todos os obxectos seleccionados" -#: ../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 "incomplete - todos os obxectos incompletos" -#: ../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 "untagged - todos os obxectos sen etiquetar" -#: ../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" @@ -2442,5 +2608,5 @@ "coa expresión" -#: ../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" @@ -2449,17 +2615,17 @@ "expresión" -#: ../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 "Usar | ou OR para combinar co operador OU lóxico" -#: ../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 "Usar \" para escapar operadores (p.e. se a clave conten : )" -#: ../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 "Usar ( e ) para agrupar expresións" -#: ../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 @@ -2469,55 +2635,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 "Buscar" -#: ../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 "Comezar Busca" -#: ../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 "Non se atoparon coincidencias para \"{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 "Non se engadiu nada á selección buscando por \"{0}\"" -#: ../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 "Non se eliminou da selección buscando por \"{0}\"" -#: ../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 "Atopadas {0} coincidencias" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2531,14 +2697,14 @@ "{2}" -#: ../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" @@ -2547,26 +2713,26 @@ "relación" -#: ../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 "Faltan argumentos para OR." -#: ../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 "Faltan argumentos para NOT." -#: ../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 "Esperabase parentese de peche." -#: ../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 "" @@ -2575,9 +2741,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 "Número de parámetros incorrecto para o operador nodes." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 #, java-format msgid "" @@ -2588,5 +2754,5 @@ "de nodos ou un rango, por exemplo nodes:10-20" -#: ../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." @@ -2637,6 +2803,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 "" @@ -2644,5 +2809,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 "" @@ -2778,5 +2943,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 "" @@ -2795,5 +2960,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 "" @@ -2812,19 +2978,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" @@ -2833,5 +2999,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" @@ -2840,5 +3006,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" @@ -2847,5 +3013,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" @@ -2856,16 +3022,16 @@ #. 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 "" -"Estás a punto de borrar nodos que se atopan fora da área que " -"descargaches.
Isto pode causar problemas porque outros obxectos (que non " -"ves) poden estar usandoos.
Queres borralos realmente?" - -#: ../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 "" +"Estás a punto de borrar nodos que se atopan fora da área que descargaches." +"
Isto pode causar problemas porque outros obxectos (que non ves) poden " +"estar usandoos.
Queres borralos realmente?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "" @@ -2883,15 +3049,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 "" @@ -2902,5 +3068,5 @@ "2. Os actuais son {1}" -#: ../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}" @@ -2911,9 +3077,4 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Resolver conflitos na lista de membros da relación {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -2992,5 +3153,5 @@ msgstr "Aplicar?" -#: ../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 " @@ -3135,6 +3296,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 "" @@ -3217,5 +3378,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3224,5 +3385,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3230,25 +3391,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 "S" #. 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 "N" #. 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 "O" #. 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 "E" #: ../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 @@ -3271,25 +3432,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}" @@ -3297,6 +3459,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 "" @@ -3359,24 +3521,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 " @@ -3384,5 +3546,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 "" @@ -3414,6 +3576,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}." @@ -3434,5 +3596,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 @@ -3444,6 +3605,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 "" @@ -3454,135 +3614,135 @@ msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}" -#: ../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 "A vía de estilo de área non está pechada." -#: ../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 "a vía multipoligonal \"{0}\" non está pechada." -#: ../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 "Membro \"{0}\" borrado na relación." -#: ../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 "Vía \"{0}\" con menos de dous puntos." -#: ../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 "Atopadas máis de unha vía \"desde\"." -#: ../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 "Atopadas máis de unha vía \"ata\"." -#: ../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 "Atopouse máis de un \"vía\"." -#: ../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 "Papel \"{0}\" descoñecido." -#: ../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 "Tipo de membro descoñecido para \"{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 "Non se atoparon vias \"desde\"." -#: ../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 "Non se atoparon vías \"ata\"." -#: ../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 "Ningún nodo o vía \"vía\" atopados." -#: ../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 "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../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 "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 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 "Non se atopou o estilo para a restrición {0}" -#: ../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 "Intersección entre as vías ''{0}'' e ''{1}''." -#: ../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 "A vía interior ''{0}'' está fóra." -#: ../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 "Non hai un rol ''{0}'' útil para a Vía ''{1}'.'" -#: ../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 "Sen etiquetar" -#: ../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 "texto" -#: ../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 "Erro: {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}" @@ -3594,5 +3754,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 @@ -3611,5 +3771,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 @@ -3629,5 +3789,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 "fondo" @@ -3745,6 +3905,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 "" @@ -3759,5 +3918,5 @@ msgstr "Non amosar de novo" -#: ../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 @@ -3765,32 +3924,32 @@ msgstr "" -#: ../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 "incompleto" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "Carretera" -#: ../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 "Vía férrea" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "Vía acuática" -#: ../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" @@ -3799,5 +3958,5 @@ msgstr[1] "{0} nodos" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -4046,12 +4205,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Ficheiro" -#: ../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 @@ -4065,19 +4224,19 @@ msgstr "Edición" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Ver" -#: ../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 "Ferramentas" -#: ../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 "Axustes prestablecidos" -#: ../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 @@ -4088,5 +4247,5 @@ msgstr "Menú: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Audio" @@ -4130,29 +4289,29 @@ msgstr "escalar" -#: ../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 "A lonxitude xeográfica na posición do punteiro do rato." -#: ../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 "O nome do obxecto na posición do punteiro do rato." -#: ../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 "A latitude xeográfica na posición do punteiro do rato." -#: ../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 "O ángulo entre o segmento previo e o actual da vía." -#: ../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 "A dirección (da brúxula) do segmento de liña que se está a debuxar." -#: ../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 "A lonxitude do novo segmento de vía que se está a debuxar." -#: ../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 " @@ -4160,9 +4319,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(sen obxecto)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "" @@ -4271,5 +4430,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" @@ -4278,5 +4437,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" @@ -4285,5 +4444,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" @@ -4302,5 +4461,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 @@ -4317,5 +4476,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" @@ -4387,22 +4546,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." @@ -4481,6 +4640,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 "" @@ -4549,6 +4707,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" @@ -4556,6 +4714,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" @@ -4612,6 +4770,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 "" @@ -4646,7 +4804,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 "" @@ -4792,5 +4950,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 "" @@ -4925,5 +5083,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 "" @@ -5023,7 +5181,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" @@ -5033,6 +5191,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" @@ -5066,7 +5224,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 "" @@ -5155,5 +5311,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 @@ -5220,10 +5376,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 "" @@ -5298,18 +5453,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 "Historial" -#: ../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 "Amosar o historial de todos os elementos seleccionados." -#: ../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 @@ -5319,14 +5474,14 @@ msgstr "Recargar" -#: ../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 "" "Recargar todos os obxectos seleccionados actualmente e actualizar a lista." -#: ../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 "" @@ -5520,5 +5675,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 "" @@ -5561,25 +5716,25 @@ msgstr "Facer zoom sobre a selección" -#: ../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 "Sel.: Rel.:{0} / Vías:{1} / Nodos:{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 "Selección" -#: ../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 "Selección: {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 "Desacoplar o panel" -#: ../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." @@ -5588,5 +5743,5 @@ "da esquerda." -#: ../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 "Facer click para minimizar/maximizar o contido do panel" @@ -5647,37 +5802,37 @@ msgstr "# Obxectos" -#: ../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 "" @@ -5686,63 +5841,91 @@ 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] "Descargar todas as vías e nodos incompletos na relación" +msgstr[1] "Descargar todas as vías e nodos incompletos na relación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Descargar Lugar" + +#: ../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 "Aplicar axuste preestablecido" + +#: ../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 "Abrir un editor para a relación seleccionada" + +#: ../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 "" @@ -5752,15 +5935,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 " @@ -5768,5 +5951,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 " @@ -5774,20 +5957,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 "" @@ -5796,66 +5979,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 "Atallo" + +#: ../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 "Mover os membros actualmente seleccionados cara arriba" #. 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 "Mover os membros seleccionados actualmente cara abaixo" #. 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 " @@ -5864,53 +6051,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 "Descargar todas as vías e nodos incompletos na relación" -#: ../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 "Descargar Membros" -#: ../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 "" @@ -5920,41 +6113,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 "" @@ -5994,19 +6180,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 "Aplicar Cambios" -#: ../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}''" @@ -6018,6 +6204,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 "" @@ -6200,7 +6385,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 "" @@ -6973,5 +7157,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 @@ -7208,6 +7392,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 "" @@ -7217,6 +7401,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 "" @@ -7479,13 +7663,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}" @@ -7586,6 +7770,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 "" @@ -7670,6 +7853,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] "" @@ -7683,6 +7866,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 " @@ -7737,5 +7920,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 " @@ -7743,5 +7926,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 "" @@ -7814,40 +7997,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 "Obxectos para engadir:" -#: ../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 "Obxectos para modificar:" -#: ../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 "Obxectos para borrar:" -#: ../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:" @@ -7856,5 +8039,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:" @@ -7863,5 +8046,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:" @@ -7870,68 +8053,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 "Subir Cambios" -#: ../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 "Por favor, primeiro introduce as coordenadas desexadas." + +#: ../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 "Proporciona un breve comentario para os cambios que vas a subir:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../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}" @@ -7939,16 +8121,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}." @@ -7956,6 +8138,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 "" @@ -7964,5 +8146,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 "" @@ -7992,111 +8174,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Imaxes para {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "Ler GPX..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Non hai hora para o punto {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 "Non se puido ler a hora \"{0}\" do punto {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 "Lendo {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Non se atoparon imaxes con marcas de tempo lexibles." - -#: ../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 "Imaxes xeo-etiquetadas" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "Inicio GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "Fin GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "delta actual: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "Diferencia de zona horaria: " - -#: ../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] "imaxe" -msgstr[1] "imaxes" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} dentro da traza." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Sincronizar reloxo" - -#: ../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 "imaxes JPEG (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "A data no ficheiro \"{0}\" non puido ser analizada." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "Non hai hora EXIF no ficheiro \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Imaxe" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "Zona horaria da unidade GPS (differencia coa foto)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Sincronizar hora coa da unidade GPS" - -#: ../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 "A hora introducida non puido ser analizada." - -#: ../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} metros" +msgstr[1] "{0} metros" + +#: ../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 "Por favor introduce unha cadea de busca" + +#: ../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 @@ -8104,30 +8230,30 @@ msgstr "punto 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 "Personalizar debuxo de liñas" -#: ../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 "Usar configuración global." -#: ../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 "Debuxar liñas entre puntos para esta capa." -#: ../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 "Non debuxar liñas entre puntos para esta capa." -#: ../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 "Seleccionar as opcións de liña do debuxo" -#: ../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 @@ -8135,5 +8261,5 @@ msgstr "Personalizar Cor" -#: ../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 @@ -8142,5 +8268,5 @@ msgstr "Predeterminado" -#: ../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 @@ -8149,58 +8275,63 @@ msgstr "Escolle unha cor" -#: ../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 "Importar Audio" -#: ../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 "Ficheiros Wave Audio (*.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 "Marcas de audio de {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 "Importar imaxes" -#: ../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 "imaxes JPEG (*.jpg)" + +#: ../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 "Nome: {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 @@ -8208,5 +8339,5 @@ msgstr "Descrición: {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" @@ -8216,5 +8347,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 @@ -8222,22 +8353,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 "Lonxitude: " -#: ../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, " @@ -8246,5 +8372,5 @@ msgstr[1] "{0} rutas, " -#: ../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" @@ -8253,24 +8379,24 @@ msgstr[1] "{0} puntos de vía" -#: ../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 "Convertir en capa de datos" -#: ../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:" +#: ../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 "" "A subida de datos GPS sen procesar como datos de mapa considerase " "perxudicial.
Se desexas subir trazados, mira aqui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8280,29 +8406,29 @@ msgstr "Convertido de: {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 "Descargar todo o que abarca:" -#: ../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} metros" -#: ../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 "Área máxima por petición:" -#: ../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} km cad." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8313,9 +8439,9 @@ "Desexas
continuar?" -#: ../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 "Non hai trazados GPX dispoñibles na capa para asociar ó audio." -#: ../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 " @@ -8323,5 +8449,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 " @@ -8331,23 +8457,23 @@ "correctamente os seus tempos foron omitidos." -#: ../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 "Capa de datos {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 "fora da área descargada" -#: ../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." @@ -8356,5 +8482,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 "" @@ -8368,5 +8494,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 "" @@ -8379,11 +8505,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" @@ -8392,32 +8518,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} composto de:" -#: ../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 "Convertir a capa GPX" -#: ../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 "" @@ -8425,6 +8551,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 "" @@ -8463,4 +8589,347 @@ msgstr[1] "{0} puntos" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "Ficheiros GPX (*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "O ficheiro {0} cárgase baixo o nome \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#, java-format +msgid "Error while parsing {0}" +msgstr "Erro durante a análise {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Non se puido ler \"{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 "Valores Predeterminados" + +#: ../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 "Ler fotos..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "Lendo {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 "Atopouse un ficheiro nulo no directorio {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Erro obtendo ficheiros do directorio {0}\n" + +#: ../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 "Imaxes xeo-etiquetadas" + +#: ../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] "imaxe" +msgstr[1] "imaxes" + +#: ../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 "Erro no ficheiro {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Imaxes xeo-etiquetadas" + +#: ../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 "Previo" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Eliminar foto da capa" + +#: ../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 "Seguinte" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "Centrar vista" + +#: ../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 "" +"\n" +"Altitude: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8677,6 +9146,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80 msgid "When importing audio, apply it to any waypoints in the GPX layer." -msgstr "" -"Cando se importe audio, aplicalo a calquera punto de vía na capa GPX." +msgstr "Cando se importe audio, aplicalo a calquera punto de vía na capa GPX." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85 @@ -8779,5 +9247,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 @@ -8975,6 +9443,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 "" "Debuxar as frechas de dirección usando búsquedas nas táboas en lugar de " @@ -9040,6 +9507,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 "" "Aplicar filtros antialiasing á vista do mapa para acadar unha apariencia " @@ -9112,19 +9578,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 "Apariencia e comportamento" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Idioma" + +#: ../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 "Por defecto (decidido automáticamente)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Idioma" - -#: ../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 @@ -9385,6 +9851,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 "" @@ -9450,12 +9916,12 @@ "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 "" "

Ademais, os atallos actívanse cando as accións son asignadas a unha " "entrada de menú dun botón por primeira vez. Polo que os cambios poida que se " "apliquen incluso sen reiniciar --- pero tamén sen control de colisións. Esta " -"é outra razón para reiniciar JOSM logo de realizar algún cambio " -"aqui.

" +"é outra razón para reiniciar JOSM logo de realizar algún cambio aqui." +"

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:170 @@ -9467,9 +9933,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 "" "

Poida que notes que a lista de selección de teclas da páxina seguinte " @@ -9480,8 +9945,8 @@ "SUN si), non a uses. Ademais aparecerán teclas que correspondan cun atallo " "no teu teclado (p.e. ':'/Dous puntos). Por favor, tampouco as uses, usa no " -"seu lugar a tecla base (';'/Punto e coma nos teclados norteamericanos, " -"'.'/Punto nos teclados españois,...). Non facelo así pode causar conflitos " -"dado que JOSM non ten forma de saber que 'Ctrl+Maiús+.' e 'Ctrl+:' son " -"realmente a mesma cousa nun teclado español...

" +"seu lugar a tecla base (';'/Punto e coma nos teclados norteamericanos, '.'/" +"Punto nos teclados españois,...). Non facelo así pode causar conflitos dado " +"que JOSM non ten forma de saber que 'Ctrl+Maiús+.' e 'Ctrl+:' son realmente " +"a mesma cousa nun teclado español...

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177 @@ -9509,6 +9974,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 "" "

O pseudo modificador 'desactivado' desactivará o atallo cando o atope.

" @@ -9602,5 +10067,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 "Máis información acerca desta característica" @@ -9687,5 +10152,5 @@ msgstr "Descargando os puntos {0} a {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 @@ -9693,5 +10158,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9703,6 +10168,5 @@ #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 msgid "NullPointerException, possibly some missing tags." -msgstr "" -"Exception de Punteiro Nulo, posiblemente algunhas etiquetas perdidas." +msgstr "Exception de Punteiro Nulo, posiblemente algunhas etiquetas perdidas." #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 @@ -9807,6 +10271,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331 msgid "Parse error: invalid document structure for GPX document." -msgstr "" -"Erro de análise: estrutura de documento non válida para documento gpx" +msgstr "Erro de análise: estrutura de documento non válida para documento gpx" #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239 @@ -9815,14 +10278,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 @@ -9850,24 +10312,31 @@ 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] "Descargando os puntos {0} a {1}..." +msgstr[1] "Descargando os puntos {0} a {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9909,29 +10378,29 @@ 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 "Esta versión de JOSM é incompatible co servidor configurado." -#: ../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}." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#, fuzzy, java-format +msgid "" +"It supports protocol version 0.6, while the server says it supports {0} to " +"{1}." msgstr "" "Acepta as versións de protocolo 0.5 e 0.6, mentres que o servidor di que " "acepta {0} a {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Establecida a comunicación con {0} usando o protocolo da versión {1}" -#: ../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 "" @@ -9939,66 +10408,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 "Pechando colección de cambios..." -#: ../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 "Preparando..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Subindo..." -#: ../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}." @@ -10033,5 +10502,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}''." @@ -10058,5 +10527,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}." @@ -10064,5 +10533,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}" @@ -10075,5 +10544,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}''." @@ -10133,7 +10602,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 "" @@ -10161,6 +10630,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 "" @@ -10226,46 +10695,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 "" @@ -10273,19 +10741,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 "Especificación incompleta de elemento con ref=0" -#: ../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 "Obxecto ilegal con 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 "" @@ -10295,8 +10763,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 "" @@ -10306,25 +10774,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 "" @@ -10332,5 +10800,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10339,5 +10807,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10345,5 +10813,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10352,13 +10820,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 "Preparar os datos de OSM..." -#: ../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 "" @@ -10411,4 +10879,10 @@ msgid "Contacting Server..." msgstr "Contactando co Servidor..." + +#: ../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 @@ -10448,42 +10922,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 "" @@ -10525,17 +11000,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 "Borrar {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Erro borrando ficheiro de engadido: {0}" + +#: ../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}." @@ -10547,19 +11032,18 @@ msgstr "Ocurriu un erro no engadido {0}" -#: ../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" @@ -10568,50 +11052,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 "A última actualización de engadidos foi fai máis de {0} días." -#: ../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 "O engadido {0} foi requerida polo engadido {1} pero non se atopou." -#: ../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 "Engadido non atopado: {0}" -#: ../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 "Non se puido cargar o engadido {0}. Borrar das preferencias?" -#: ../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 "Desactivar engadido" -#: ../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 " @@ -10621,9 +11105,9 @@ "permisos para sobrescribir os existentes." -#: ../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 "" @@ -10632,10 +11116,10 @@ "Ocurriu unha excepción inesperada que puido proceder do engadido \"{0}\"." -#: ../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 "Dacordo coa información contida no engadido, o autor é {0}." -#: ../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." @@ -10644,9 +11128,9 @@ "dun fallo." -#: ../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 "Debería ser desactivado o engadido?" -#: ../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 " @@ -10654,13 +11138,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" @@ -10780,6 +11264,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 "" @@ -10817,10 +11301,10 @@ 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 "" "A subida ao servidor fallou porque o teu
paquete " -"de datos actual viola a condición previa.
A mensaxe de erro " -"é:
{0}" +"de datos actual viola a condición previa.
A mensaxe de erro é:
{0}" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 @@ -10881,7 +11365,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 "" @@ -10893,7 +11376,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 "" @@ -10925,6 +11408,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 "" @@ -11176,5 +11659,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" @@ -11189,12 +11672,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 @@ -11202,445 +11683,140 @@ 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 +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 +msgid "Actual" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "imaxe" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +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 +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 "Previo" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Eliminar foto da capa" - -#: ../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 "Seguinte" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "Centrar vista" - -#: ../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 "" -"\n" -"Altitude: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/h" - -#: ../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 "Ler fotos..." - -#: ../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 "Atopouse un ficheiro nulo no directorio {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Erro obtendo ficheiros do directorio {0}\n" - -#: ../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 "Abrir imaxes con AgPifoJ..." - -#: ../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 "Cargar conxunto de imaxes como unha nova capa" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "Ficheiros GPX (*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "O ficheiro {0} cárgase baixo o nome \"{1}\"" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#, java-format -msgid "Error while parsing {0}" -msgstr "Erro durante a análise {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Non se puido ler \"{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 "Valores Predeterminados" - -#: ../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 "Erro no ficheiro {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11784,11 +11960,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 "" @@ -12097,12 +12272,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 @@ -12216,14 +12383,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 " @@ -12531,4 +12698,8 @@ msgstr "" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Cargar conxunto de imaxes como unha nova capa" + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -12572,18 +12743,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" @@ -12632,7 +12803,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12642,5 +12813,5 @@ #. 50000 #. -#. +#. #. #. @@ -12650,5 +12821,5 @@ #. 50000 #. -#. +#. #. #. @@ -12657,5 +12828,5 @@ #. 50000 #. -#. +#. #. #. @@ -12665,5 +12836,5 @@ #. 50000 #. -#. +#. #. #. @@ -12741,6 +12912,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 "" @@ -12759,7 +12929,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 "" @@ -12821,20 +12990,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 "" @@ -13051,6 +13219,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 "" @@ -13131,9 +13298,10 @@ msgstr "Extensión de ficheiro descoñecida: {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 " @@ -13141,9 +13309,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 "" @@ -13516,17 +13680,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 "" @@ -13569,160 +13733,4 @@ #: ../plugins/terracer/src/terracer/TerracerAction.java:475 msgid "Optional" -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 "Introducir valores para todos os conflitos." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Resolver Conflitos" - -#: ../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 "" @@ -13819,5 +13827,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}" @@ -13870,34 +13878,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 "" @@ -13946,18 +13954,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 "" @@ -14188,7 +14196,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 "" @@ -14332,5 +14339,5 @@ #. 50000 #. -#. +#. #. #. @@ -14338,5 +14345,5 @@ #. #. -#. +#. #. #. @@ -14346,5 +14353,5 @@ #. 50000 #. -#. +#. #. #. @@ -14353,5 +14360,5 @@ #. 50000 #. -#. +#. #. #. @@ -14360,5 +14367,5 @@ #. 50000 #. -#. +#. #. #. @@ -14367,5 +14374,5 @@ #. 50000 #. -#. +#. #. #. @@ -14374,5 +14381,5 @@ #. 50000 #. -#. +#. #. #. @@ -14381,9 +14388,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14428,5 +14435,5 @@ #. 50000 #. -#. +#. #. #. @@ -14559,14 +14566,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 " @@ -14575,14 +14582,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 "" @@ -14591,5 +14598,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 "" @@ -14601,13 +14608,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." @@ -14761,50 +14768,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 "Gardar capa WMS nun ficheiro" -#: ../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 "Cargar capa WMS dende ficheiro" -#: ../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 "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "File Format Error" msgstr "Erro de Formato de Ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "Erro cargando ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -14880,5 +14887,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 "" @@ -14916,21 +14923,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 " @@ -14942,21 +14944,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 " @@ -14965,10 +14967,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 " @@ -14977,21 +14979,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 " @@ -15001,16 +15002,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 " @@ -15020,10 +15021,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 " @@ -15032,5 +15033,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 " @@ -15040,27 +15041,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 " @@ -15069,15 +15070,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 +msgid "Let other applications send commands to JOSM." +msgstr "" + +#. Plugin routes #: build/trans_plugins.java:55 -msgid "Let other applications send commands to JOSM." -msgstr "" - -#. Plugin routes -#: build/trans_plugins.java:57 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15086,10 +15087,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 " @@ -15098,15 +15099,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 " @@ -15116,17 +15117,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 " @@ -15135,5 +15129,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15142,10 +15136,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, ...)." @@ -16198,8 +16192,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16396,5 +16390,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16404,5 +16398,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16421,5 +16415,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16429,5 +16423,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16446,5 +16440,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16454,5 +16448,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16471,5 +16465,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16479,5 +16473,5 @@ #. 300000 #. -#. +#. #. #. @@ -16492,5 +16486,5 @@ #. 300000 #. -#. +#. #. #. @@ -16508,5 +16502,5 @@ #. 50000 #. -#. +#. #. #. @@ -16524,5 +16518,5 @@ #. 40000 #. -#. +#. #. #. @@ -16531,5 +16525,5 @@ #. 40000 #. -#. +#. #. #. @@ -16539,5 +16533,5 @@ #. 50000 #. -#. +#. #. #. @@ -16557,5 +16551,5 @@ #. 50000 #. -#. +#. #. #. @@ -16564,5 +16558,5 @@ #. 50000 #. -#. +#. #. #. @@ -16572,5 +16566,5 @@ #. 50000 #. -#. +#. #. #. @@ -16620,7 +16614,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17319,5 +17313,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17356,5 +17350,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17450,5 +17444,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17605,5 +17599,5 @@ #. 50000 #. -#. +#. #. #. @@ -18990,5 +18984,5 @@ #. 30000 #. -#. +#. #. #. @@ -18998,5 +18992,5 @@ #. 40000 #. -#. +#. #. #. @@ -19006,5 +19000,5 @@ #. 20000 #. -#. +#. #. #. @@ -19014,5 +19008,5 @@ #. 40000 #. -#. +#. #. #. @@ -19370,7 +19364,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19380,5 +19374,5 @@ #. 50000 #. -#. +#. #. #. @@ -19388,5 +19382,5 @@ #. 50000 #. -#. +#. #. #. @@ -19396,5 +19390,5 @@ #. 50000 #. -#. +#. #. #. @@ -19404,5 +19398,5 @@ #. 50000 #. -#. +#. #. #. @@ -19412,5 +19406,5 @@ #. 50000 #. -#. +#. #. #. @@ -19420,5 +19414,5 @@ #. 50000 #. -#. +#. #. #. @@ -19428,5 +19422,5 @@ #. 50000 #. -#. +#. #. #. @@ -19436,5 +19430,5 @@ #. 50000 #. -#. +#. #. #. @@ -19444,5 +19438,5 @@ #. 50000 #. -#. +#. #. #. @@ -19452,5 +19446,5 @@ #. 50000 #. -#. +#. #. #. @@ -19460,5 +19454,5 @@ #. 50000 #. -#. +#. #. #. @@ -19468,5 +19462,5 @@ #. 50000 #. -#. +#. #. #. @@ -19476,5 +19470,5 @@ #. 50000 #. -#. +#. #. #. @@ -19484,5 +19478,5 @@ #. 50000 #. -#. +#. #. #. @@ -19492,5 +19486,5 @@ #. 50000 #. -#. +#. #. #. @@ -19500,5 +19494,5 @@ #. 50000 #. -#. +#. #. #. @@ -19508,5 +19502,5 @@ #. 50000 #. -#. +#. #. #. @@ -19516,5 +19510,5 @@ #. 50000 #. -#. +#. #. #. @@ -19524,5 +19518,5 @@ #. 50000 #. -#. +#. #. #. @@ -19532,5 +19526,5 @@ #. 50000 #. -#. +#. #. #. @@ -19540,5 +19534,5 @@ #. 50000 #. -#. +#. #. #. @@ -19548,5 +19542,5 @@ #. 50000 #. -#. +#. #. #. @@ -19556,5 +19550,5 @@ #. 50000 #. -#. +#. #. #. @@ -19564,5 +19558,5 @@ #. 50000 #. -#. +#. #. #. @@ -19572,5 +19566,5 @@ #. 50000 #. -#. +#. #. #. @@ -19580,5 +19574,5 @@ #. 50000 #. -#. +#. #. #. @@ -19588,5 +19582,5 @@ #. 50000 #. -#. +#. #. #. @@ -19596,5 +19590,5 @@ #. 50000 #. -#. +#. #. #. @@ -19604,5 +19598,5 @@ #. 50000 #. -#. +#. #. #. @@ -19612,5 +19606,5 @@ #. 50000 #. -#. +#. #. #. @@ -19620,5 +19614,5 @@ #. 50000 #. -#. +#. #. #. @@ -19628,5 +19622,5 @@ #. 50000 #. -#. +#. #. #. @@ -19636,5 +19630,5 @@ #. 50000 #. -#. +#. #. #. @@ -19644,5 +19638,5 @@ #. 50000 #. -#. +#. #. #. @@ -19652,5 +19646,5 @@ #. 50000 #. -#. +#. #. #. @@ -19660,5 +19654,5 @@ #. 50000 #. -#. +#. #. #. @@ -19668,5 +19662,5 @@ #. 50000 #. -#. +#. #. #. @@ -19676,5 +19670,5 @@ #. 50000 #. -#. +#. #. #. @@ -19684,5 +19678,5 @@ #. 50000 #. -#. +#. #. #. @@ -19692,5 +19686,5 @@ #. 50000 #. -#. +#. #. #. @@ -19700,5 +19694,5 @@ #. 50000 #. -#. +#. #. #. @@ -19708,5 +19702,5 @@ #. 50000 #. -#. +#. #. #. @@ -19716,5 +19710,5 @@ #. 50000 #. -#. +#. #. #. @@ -19724,5 +19718,5 @@ #. 50000 #. -#. +#. #. #. @@ -19732,5 +19726,5 @@ #. 50000 #. -#. +#. #. #. @@ -19740,5 +19734,5 @@ #. 50000 #. -#. +#. #. #. @@ -21432,7 +21426,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21442,5 +21436,5 @@ #. 50000 #. -#. +#. #. #. @@ -21450,5 +21444,5 @@ #. 50000 #. -#. +#. #. #. @@ -21458,5 +21452,5 @@ #. 50000 #. -#. +#. #. #. @@ -21466,5 +21460,5 @@ #. 50000 #. -#. +#. #. #. @@ -21474,5 +21468,5 @@ #. 50000 #. -#. +#. #. #. @@ -21482,5 +21476,5 @@ #. 50000 #. -#. +#. #. #. @@ -21490,5 +21484,5 @@ #. 50000 #. -#. +#. #. #. @@ -22819,5 +22813,5 @@ #. 40000 #. -#. +#. #. #. @@ -22833,5 +22827,5 @@ #. 30000 #. -#. +#. #. #. @@ -22842,7 +22836,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22852,5 +22846,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22860,13 +22862,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22876,5 +22870,5 @@ #. 50000 #. -#. +#. #. #. @@ -22907,5 +22901,5 @@ #. 50000 #. -#. +#. #. #. @@ -22921,5 +22915,5 @@ #. 50000 #. -#. +#. #. #. @@ -22929,5 +22923,5 @@ #. 10000 #. -#. +#. #. #. @@ -22937,5 +22931,5 @@ #. 10000 #. -#. +#. #. #. @@ -22946,5 +22940,5 @@ #. 10000 #. -#. +#. #. #. @@ -22973,5 +22967,5 @@ #. 50000 #. -#. +#. #. #. @@ -23086,9 +23080,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 @@ -23096,5 +23090,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, @@ -23104,8 +23098,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 @@ -23119,5 +23113,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23125,5 +23119,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23172,6 +23166,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23251,5 +23245,5 @@ #. 40000 #. -#. +#. #. #. @@ -23259,5 +23253,5 @@ #. 10000 #. -#. +#. #. #. @@ -23266,5 +23260,5 @@ #. 50000 #. -#. +#. #. #. @@ -23274,5 +23268,5 @@ #. 50000 #. -#. +#. #. #. @@ -23281,5 +23275,5 @@ #. 50000 #. -#. +#. #. #. @@ -23288,5 +23282,5 @@ #. 50000 #. -#. +#. #. #. @@ -23295,5 +23289,5 @@ #. 50000 #. -#. +#. #. #. @@ -23302,5 +23296,5 @@ #. 50000 #. -#. +#. #. #. @@ -23309,5 +23303,5 @@ #. 40000 #. -#. +#. #. #. @@ -23316,5 +23310,5 @@ #. 50000 #. -#. +#. #. #. @@ -23323,5 +23317,5 @@ #. 50000 #. -#. +#. #. #. @@ -23330,5 +23324,5 @@ #. 50000 #. -#. +#. #. #. @@ -23337,5 +23331,5 @@ #. 50000 #. -#. +#. #. #. @@ -23344,5 +23338,5 @@ #. 50000 #. -#. +#. #. #. @@ -23351,5 +23345,5 @@ #. 50000 #. -#. +#. #. #. @@ -23359,5 +23353,5 @@ #. 50000 #. -#. +#. #. #. @@ -23366,5 +23360,5 @@ #. 50000 #. -#. +#. #. #. @@ -23375,5 +23369,5 @@ #. 50000 #. -#. +#. #. #. @@ -23385,11 +23379,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23398,7 +23392,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23409,5 +23403,5 @@ #. 50000 #. -#. +#. #. #. @@ -23418,5 +23412,5 @@ #. 50000 #. -#. +#. #. #. @@ -23427,5 +23421,5 @@ #. 50000 #. -#. +#. #. #. @@ -23436,5 +23430,5 @@ #. 50000 #. -#. +#. #. #. @@ -23445,5 +23439,5 @@ #. 50000 #. -#. +#. #. #. @@ -23454,5 +23448,5 @@ #. 40000 #. -#. +#. #. #. @@ -23464,5 +23458,5 @@ #. 50000 #. -#. +#. #. #. @@ -23473,5 +23467,5 @@ #. 50000 #. -#. +#. #. #. @@ -23496,5 +23490,5 @@ #. 10000 #. -#. +#. #. #. @@ -23503,5 +23497,5 @@ #. 50000 #. -#. +#. #. #. @@ -23510,5 +23504,5 @@ #. 50000 #. -#. +#. #. #. @@ -23524,5 +23518,5 @@ #. 20000 #. -#. +#. #. #. @@ -23536,5 +23530,5 @@ #. 30000 #. -#. +#. #. #. @@ -23543,5 +23537,5 @@ #. 50000 #. -#. +#. #. #. @@ -23550,5 +23544,5 @@ #. 50000 #. -#. +#. #. #. @@ -23557,5 +23551,5 @@ #. 50000 #. -#. +#. #. #. @@ -23564,5 +23558,5 @@ #. 50000 #. -#. +#. #. #. @@ -23571,5 +23565,5 @@ #. 50000 #. -#. +#. #. #. @@ -23578,5 +23572,5 @@ #. 50000 #. -#. +#. #. #. @@ -23585,5 +23579,5 @@ #. 50000 #. -#. +#. #. #. @@ -23592,5 +23586,5 @@ #. 50000 #. -#. +#. #. #. @@ -23599,5 +23593,5 @@ #. 50000 #. -#. +#. #. #. @@ -23606,5 +23600,5 @@ #. 50000 #. -#. +#. #. #. @@ -23613,5 +23607,5 @@ #. 50000 #. -#. +#. #. #. @@ -23620,5 +23614,5 @@ #. 50000 #. -#. +#. #. #. @@ -23627,5 +23621,5 @@ #. 50000 #. -#. +#. #. #. @@ -23634,5 +23628,5 @@ #. 50000 #. -#. +#. #. #. @@ -23803,7 +23797,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23817,5 +23811,5 @@ #. 40000 #. -#. +#. #. #. @@ -23825,7 +23819,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23835,5 +23829,5 @@ #. 50000 #. -#. +#. #. #. @@ -23843,5 +23837,5 @@ #. 50000 #. -#. +#. #. #. @@ -23851,5 +23845,5 @@ #. 50000 #. -#. +#. #. #. @@ -23859,5 +23853,5 @@ #. 50000 #. -#. +#. #. #. @@ -23873,5 +23867,5 @@ #. 10000 #. -#. +#. #. #. @@ -23881,5 +23875,5 @@ #. 50000 #. -#. +#. #. #. @@ -23889,5 +23883,5 @@ #. 50000 #. -#. +#. #. #. @@ -23897,5 +23891,5 @@ #. 50000 #. -#. +#. #. #. @@ -23905,5 +23899,5 @@ #. 50000 #. -#. +#. #. #. @@ -23913,5 +23907,5 @@ #. 50000 #. -#. +#. #. #. @@ -23921,5 +23915,5 @@ #. 50000 #. -#. +#. #. #. @@ -23938,5 +23932,5 @@ #. 50000 #. -#. +#. #. #. @@ -23945,5 +23939,5 @@ #. 50000 #. -#. +#. #. #. @@ -23957,5 +23951,5 @@ #. 50000 #. -#. +#. #. #. @@ -23969,5 +23963,5 @@ #. 50000 #. -#. +#. #. #. @@ -23976,5 +23970,5 @@ #. 50000 #. -#. +#. #. #. @@ -23988,5 +23982,5 @@ #. 50000 #. -#. +#. #. #. @@ -24001,5 +23995,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24014,5 +24008,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24026,5 +24020,5 @@ #. 50000 #. -#. +#. #. #. @@ -24038,5 +24032,5 @@ #. 50000 #. -#. +#. #. #. @@ -24045,5 +24039,5 @@ #. 50000 #. -#. +#. #. #. @@ -24052,5 +24046,5 @@ #. 50000 #. -#. +#. #. #. @@ -24064,5 +24058,5 @@ #. 50000 #. -#. +#. #. #. @@ -24072,5 +24066,5 @@ #. 50000 #. -#. +#. #. #. @@ -24079,5 +24073,5 @@ #. 50000 #. -#. +#. #. #. @@ -24086,5 +24080,5 @@ #. 50000 #. -#. +#. #. #. @@ -24093,5 +24087,5 @@ #. 50000 #. -#. +#. #. #. @@ -24101,5 +24095,5 @@ #. 50000 #. -#. +#. #. #. @@ -24110,5 +24104,5 @@ #. 50000 #. -#. +#. #. #. @@ -24118,7 +24112,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24128,5 +24122,5 @@ #. 50000 #. -#. +#. #. #. @@ -24136,5 +24130,5 @@ #. 50000 #. -#. +#. #. #. @@ -24144,5 +24138,5 @@ #. 50000 #. -#. +#. #. #. @@ -24153,5 +24147,5 @@ #. 50000 #. -#. +#. #. #. @@ -24161,5 +24155,5 @@ #. 50000 #. -#. +#. #. #. @@ -24169,5 +24163,5 @@ #. 50000 #. -#. +#. #. #. @@ -24177,5 +24171,5 @@ #. 50000 #. -#. +#. #. #. @@ -24185,5 +24179,5 @@ #. 50000 #. -#. +#. #. #. @@ -24193,5 +24187,5 @@ #. 50000 #. -#. +#. #. #. @@ -24201,5 +24195,5 @@ #. 50000 #. -#. +#. #. #. @@ -24209,5 +24203,5 @@ #. 50000 #. -#. +#. #. #. @@ -24217,5 +24211,5 @@ #. 50000 #. -#. +#. #. #. @@ -24238,7 +24232,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24248,5 +24242,5 @@ #. 50000 #. -#. +#. #. #. @@ -24255,5 +24249,5 @@ #. 50000 #. -#. +#. #. #. @@ -24263,5 +24257,5 @@ #. 50000 #. -#. +#. #. #. @@ -24270,5 +24264,5 @@ #. 50000 #. -#. +#. #. #. @@ -24278,5 +24272,5 @@ #. 50000 #. -#. +#. #. #. @@ -24286,5 +24280,5 @@ #. 50000 #. -#. +#. #. #. @@ -24300,5 +24294,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24309,5 +24303,5 @@ #. 50000 #. -#. +#. #. #. @@ -24326,5 +24320,5 @@ #. 50000 #. -#. +#. #. #. @@ -24334,5 +24328,5 @@ #. 50000 #. -#. +#. #. #. @@ -24345,5 +24339,5 @@ #. 50000 #. -#. +#. #. #. @@ -24361,5 +24355,5 @@ #. 50000 #. -#. +#. #. #. @@ -24368,5 +24362,5 @@ #. 50000 #. -#. +#. #. #. @@ -24375,5 +24369,5 @@ #. 50000 #. -#. +#. #. #. @@ -24382,7 +24376,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24393,5 +24387,5 @@ #. 50000 #. -#. +#. #. #. @@ -24406,5 +24400,5 @@ #. 50000 #. -#. +#. #. #. @@ -24418,5 +24412,5 @@ #. 50000 #. -#. +#. #. #. @@ -24426,5 +24420,5 @@ #. 50000 #. -#. +#. #. #. @@ -24438,5 +24432,5 @@ #. 50000 #. -#. +#. #. #. @@ -24450,5 +24444,5 @@ #. 50000 #. -#. +#. #. #. @@ -24457,7 +24451,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24467,5 +24461,5 @@ #. 50000 #. -#. +#. #. #. @@ -24475,5 +24469,5 @@ #. 50000 #. -#. +#. #. #. @@ -24483,5 +24477,5 @@ #. 50000 #. -#. +#. #. #. @@ -24491,5 +24485,5 @@ #. 50000 #. -#. +#. #. #. @@ -24505,7 +24499,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24520,5 +24514,5 @@ #. 30000 #. -#. +#. #. #. @@ -24533,5 +24527,5 @@ #. 30000 #. -#. +#. #. #. @@ -24546,5 +24540,5 @@ #. 30000 #. -#. +#. #. #. @@ -24559,5 +24553,5 @@ #. 30000 #. -#. +#. #. #. @@ -24572,5 +24566,5 @@ #. 30000 #. -#. +#. #. #. @@ -24585,7 +24579,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24595,5 +24589,5 @@ #. 50000 #. -#. +#. #. #. @@ -24602,5 +24596,5 @@ #. 50000 #. -#. +#. #. #. @@ -24610,5 +24604,5 @@ #. 50000 #. -#. +#. #. #. @@ -24618,5 +24612,5 @@ #. 50000 #. -#. +#. #. #. @@ -24626,5 +24620,5 @@ #. 50000 #. -#. +#. #. #. @@ -24634,5 +24628,5 @@ #. 50000 #. -#. +#. #. #. @@ -24642,5 +24636,5 @@ #. 50000 #. -#. +#. #. #. @@ -24650,5 +24644,5 @@ #. 50000 #. -#. +#. #. #. @@ -24658,5 +24652,5 @@ #. 50000 #. -#. +#. #. #. @@ -24666,5 +24660,5 @@ #. 50000 #. -#. +#. #. #. @@ -24674,5 +24668,5 @@ #. 50000 #. -#. +#. #. #. @@ -24682,5 +24676,5 @@ #. 50000 #. -#. +#. #. #. @@ -24690,5 +24684,5 @@ #. 50000 #. -#. +#. #. #. @@ -24708,5 +24702,5 @@ #. 50000 #. -#. +#. #. #. @@ -24721,5 +24715,5 @@ #. 50000 #. -#. +#. #. #. @@ -24732,7 +24726,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24742,5 +24736,5 @@ #. 50000 #. -#. +#. #. #. @@ -24750,5 +24744,5 @@ #. 50000 #. -#. +#. #. #. @@ -24758,5 +24752,5 @@ #. 50000 #. -#. +#. #. #. @@ -24766,5 +24760,5 @@ #. 50000 #. -#. +#. #. #. @@ -24774,5 +24768,5 @@ #. 50000 #. -#. +#. #. #. @@ -24782,5 +24776,5 @@ #. 50000 #. -#. +#. #. #. @@ -24790,5 +24784,5 @@ #. 50000 #. -#. +#. #. #. @@ -24798,5 +24792,5 @@ #. 50000 #. -#. +#. #. #. @@ -24806,5 +24800,5 @@ #. 50000 #. -#. +#. #. #. @@ -24814,5 +24808,5 @@ #. 50000 #. -#. +#. #. #. @@ -24822,5 +24816,5 @@ #. 50000 #. -#. +#. #. #. @@ -24830,5 +24824,5 @@ #. 50000 #. -#. +#. #. #. @@ -24838,5 +24832,5 @@ #. 50000 #. -#. +#. #. #. @@ -24846,5 +24840,5 @@ #. 50000 #. -#. +#. #. #. @@ -24865,5 +24859,5 @@ #. 50000 #. -#. +#. #. #. @@ -24877,7 +24871,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24887,5 +24881,5 @@ #. 50000 #. -#. +#. #. #. @@ -24895,5 +24889,5 @@ #. 50000 #. -#. +#. #. #. @@ -24903,5 +24897,5 @@ #. 50000 #. -#. +#. #. #. @@ -24911,5 +24905,5 @@ #. 50000 #. -#. +#. #. #. @@ -24919,5 +24913,5 @@ #. 50000 #. -#. +#. #. #. @@ -24927,5 +24921,5 @@ #. 50000 #. -#. +#. #. #. @@ -24935,5 +24929,5 @@ #. 50000 #. -#. +#. #. #. @@ -24950,5 +24944,5 @@ #. 50000 #. -#. +#. #. #. @@ -24958,5 +24952,5 @@ #. 50000 #. -#. +#. #. #. @@ -24966,5 +24960,5 @@ #. 50000 #. -#. +#. #. #. @@ -24974,5 +24968,5 @@ #. 50000 #. -#. +#. #. #. @@ -24982,5 +24976,5 @@ #. 50000 #. -#. +#. #. #. @@ -24990,5 +24984,5 @@ #. 50000 #. -#. +#. #. #. @@ -24998,5 +24992,5 @@ #. 50000 #. -#. +#. #. #. @@ -25006,5 +25000,5 @@ #. 50000 #. -#. +#. #. #. @@ -25014,5 +25008,5 @@ #. 50000 #. -#. +#. #. #. @@ -25022,5 +25016,5 @@ #. 50000 #. -#. +#. #. #. @@ -25030,5 +25024,5 @@ #. 50000 #. -#. +#. #. #. @@ -25038,5 +25032,5 @@ #. 50000 #. -#. +#. #. #. @@ -25055,5 +25049,5 @@ #. 50000 #. -#. +#. #. #. @@ -25063,5 +25057,5 @@ #. 50000 #. -#. +#. #. #. @@ -25070,5 +25064,5 @@ #. 50000 #. -#. +#. #. #. @@ -25078,5 +25072,5 @@ #. 50000 #. -#. +#. #. #. @@ -25086,5 +25080,5 @@ #. 50000 #. -#. +#. #. #. @@ -25094,5 +25088,5 @@ #. 50000 #. -#. +#. #. #. @@ -25101,5 +25095,5 @@ #. 50000 #. -#. +#. #. #. @@ -25109,5 +25103,5 @@ #. 50000 #. -#. +#. #. #. @@ -25117,5 +25111,5 @@ #. 50000 #. -#. +#. #. #. @@ -25125,5 +25119,5 @@ #. 50000 #. -#. +#. #. #. @@ -25133,5 +25127,5 @@ #. 50000 #. -#. +#. #. #. @@ -25140,5 +25134,5 @@ #. 50000 #. -#. +#. #. #. @@ -25147,5 +25141,5 @@ #. 50000 #. -#. +#. #. #. @@ -25154,5 +25148,5 @@ #. 50000 #. -#. +#. #. #. @@ -25161,5 +25155,5 @@ #. 50000 #. -#. +#. #. #. @@ -25168,5 +25162,5 @@ #. 50000 #. -#. +#. #. #. @@ -25175,5 +25169,5 @@ #. 50000 #. -#. +#. #. #. @@ -25182,5 +25176,5 @@ #. 50000 #. -#. +#. #. #. @@ -25189,5 +25183,5 @@ #. 50000 #. -#. +#. #. #. @@ -25196,5 +25190,5 @@ #. 50000 #. -#. +#. #. #. @@ -25203,5 +25197,5 @@ #. 50000 #. -#. +#. #. #. @@ -25210,5 +25204,5 @@ #. 50000 #. -#. +#. #. #. @@ -25217,5 +25211,5 @@ #. 50000 #. -#. +#. #. #. @@ -25224,5 +25218,5 @@ #. 50000 #. -#. +#. #. #. @@ -25232,5 +25226,5 @@ #. 50000 #. -#. +#. #. #. @@ -25240,5 +25234,5 @@ #. 50000 #. -#. +#. #. #. @@ -25248,5 +25242,5 @@ #. 50000 #. -#. +#. #. #. @@ -25256,5 +25250,5 @@ #. 50000 #. -#. +#. #. #. @@ -25264,5 +25258,5 @@ #. 50000 #. -#. +#. #. #. @@ -25272,5 +25266,5 @@ #. 50000 #. -#. +#. #. #. @@ -25280,5 +25274,5 @@ #. 50000 #. -#. +#. #. #. @@ -25288,5 +25282,5 @@ #. 50000 #. -#. +#. #. #. @@ -25296,5 +25290,5 @@ #. 50000 #. -#. +#. #. #. @@ -25305,5 +25299,5 @@ #. 50000 #. -#. +#. #. #. @@ -25313,5 +25307,5 @@ #. 50000 #. -#. +#. #. #. @@ -25321,5 +25315,5 @@ #. 50000 #. -#. +#. #. #. @@ -25329,5 +25323,5 @@ #. 50000 #. -#. +#. #. #. @@ -25337,5 +25331,5 @@ #. 50000 #. -#. +#. #. #. @@ -25345,5 +25339,5 @@ #. 50000 #. -#. +#. #. #. @@ -25353,5 +25347,5 @@ #. 50000 #. -#. +#. #. #. @@ -25361,5 +25355,5 @@ #. 50000 #. -#. +#. #. #. @@ -25369,5 +25363,5 @@ #. 50000 #. -#. +#. #. #. @@ -25377,5 +25371,5 @@ #. 50000 #. -#. +#. #. #. @@ -25385,5 +25379,5 @@ #. 50000 #. -#. +#. #. #. @@ -25393,5 +25387,5 @@ #. 50000 #. -#. +#. #. #. @@ -25401,5 +25395,5 @@ #. 50000 #. -#. +#. #. #. @@ -25409,5 +25403,5 @@ #. 50000 #. -#. +#. #. #. @@ -25417,5 +25411,5 @@ #. 50000 #. -#. +#. #. #. @@ -25425,5 +25419,5 @@ #. 50000 #. -#. +#. #. #. @@ -25433,5 +25427,5 @@ #. 50000 #. -#. +#. #. #. @@ -25441,5 +25435,5 @@ #. 50000 #. -#. +#. #. #. @@ -25449,5 +25443,5 @@ #. 50000 #. -#. +#. #. #. @@ -25456,5 +25450,5 @@ #. 50000 #. -#. +#. #. #. @@ -25486,5 +25480,5 @@ #. 50000 #. -#. +#. #. #. @@ -25494,5 +25488,5 @@ #. 50000 #. -#. +#. #. #. @@ -25502,7 +25496,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25517,5 +25511,5 @@ #. 50000 #. -#. +#. #. #. @@ -25525,5 +25519,5 @@ #. 50000 #. -#. +#. #. #. @@ -25533,5 +25527,5 @@ #. 50000 #. -#. +#. #. #. @@ -25541,5 +25535,5 @@ #. 50000 #. -#. +#. #. #. @@ -25549,5 +25543,5 @@ #. 50000 #. -#. +#. #. #. @@ -25557,5 +25551,5 @@ #. 50000 #. -#. +#. #. #. @@ -25565,5 +25559,5 @@ #. 50000 #. -#. +#. #. #. @@ -25579,7 +25573,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25589,5 +25583,5 @@ #. 50000 #. -#. +#. #. #. @@ -25597,5 +25591,5 @@ #. 50000 #. -#. +#. #. #. @@ -25605,5 +25599,5 @@ #. 50000 #. -#. +#. #. #. @@ -25613,5 +25607,5 @@ #. 50000 #. -#. +#. #. #. @@ -25621,5 +25615,5 @@ #. 50000 #. -#. +#. #. #. @@ -25629,5 +25623,5 @@ #. 50000 #. -#. +#. #. #. @@ -25637,5 +25631,5 @@ #. 50000 #. -#. +#. #. #. @@ -25645,5 +25639,5 @@ #. 50000 #. -#. +#. #. #. @@ -25653,5 +25647,5 @@ #. 50000 #. -#. +#. #. #. @@ -25661,5 +25655,5 @@ #. 50000 #. -#. +#. #. #. @@ -25669,5 +25663,5 @@ #. 50000 #. -#. +#. #. #. @@ -25677,5 +25671,5 @@ #. 50000 #. -#. +#. #. #. @@ -25685,5 +25679,5 @@ #. 50000 #. -#. +#. #. #. @@ -25693,5 +25687,5 @@ #. 50000 #. -#. +#. #. #. @@ -25701,5 +25695,5 @@ #. 50000 #. -#. +#. #. #. @@ -25709,5 +25703,5 @@ #. 50000 #. -#. +#. #. #. @@ -25717,5 +25711,5 @@ #. 50000 #. -#. +#. #. #. @@ -25725,5 +25719,5 @@ #. 50000 #. -#. +#. #. #. @@ -25733,5 +25727,5 @@ #. 50000 #. -#. +#. #. #. @@ -25741,5 +25735,5 @@ #. 50000 #. -#. +#. #. #. @@ -25749,5 +25743,5 @@ #. 50000 #. -#. +#. #. #. @@ -25757,5 +25751,5 @@ #. 50000 #. -#. +#. #. #. @@ -25765,5 +25759,5 @@ #. 50000 #. -#. +#. #. #. @@ -25773,5 +25767,5 @@ #. 50000 #. -#. +#. #. #. @@ -25781,5 +25775,5 @@ #. 50000 #. -#. +#. #. #. @@ -25789,5 +25783,5 @@ #. 50000 #. -#. +#. #. #. @@ -25797,5 +25791,5 @@ #. 50000 #. -#. +#. #. #. @@ -25805,5 +25799,5 @@ #. 50000 #. -#. +#. #. #. @@ -25813,5 +25807,5 @@ #. 50000 #. -#. +#. #. #. @@ -25821,5 +25815,5 @@ #. 50000 #. -#. +#. #. #. @@ -25829,5 +25823,5 @@ #. 50000 #. -#. +#. #. #. @@ -25837,5 +25831,5 @@ #. 50000 #. -#. +#. #. #. @@ -25845,5 +25839,5 @@ #. 50000 #. -#. +#. #. #. @@ -25853,5 +25847,5 @@ #. 50000 #. -#. +#. #. #. @@ -25861,5 +25855,5 @@ #. 50000 #. -#. +#. #. #. @@ -25869,5 +25863,5 @@ #. 50000 #. -#. +#. #. #. @@ -25877,5 +25871,5 @@ #. 50000 #. -#. +#. #. #. @@ -25885,5 +25879,5 @@ #. 50000 #. -#. +#. #. #. @@ -25893,5 +25887,5 @@ #. 50000 #. -#. +#. #. #. @@ -25901,5 +25895,5 @@ #. 50000 #. -#. +#. #. #. @@ -25909,5 +25903,5 @@ #. 50000 #. -#. +#. #. #. @@ -25917,5 +25911,5 @@ #. 50000 #. -#. +#. #. #. @@ -25951,7 +25945,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25961,5 +25955,5 @@ #. 50000 #. -#. +#. #. #. @@ -25969,5 +25963,5 @@ #. 50000 #. -#. +#. #. #. @@ -25977,5 +25971,5 @@ #. 50000 #. -#. +#. #. #. @@ -25985,5 +25979,5 @@ #. 50000 #. -#. +#. #. #. @@ -25993,5 +25987,5 @@ #. 50000 #. -#. +#. #. #. @@ -26001,5 +25995,5 @@ #. 50000 #. -#. +#. #. #. @@ -26009,5 +26003,5 @@ #. 50000 #. -#. +#. #. #. @@ -26024,5 +26018,5 @@ #. 50000 #. -#. +#. #. #. @@ -26032,5 +26026,5 @@ #. 50000 #. -#. +#. #. #. @@ -26040,5 +26034,5 @@ #. 50000 #. -#. +#. #. #. @@ -26048,5 +26042,5 @@ #. 50000 #. -#. +#. #. #. @@ -26056,5 +26050,5 @@ #. 50000 #. -#. +#. #. #. @@ -26064,5 +26058,5 @@ #. 50000 #. -#. +#. #. #. @@ -26073,5 +26067,5 @@ #. 50000 #. -#. +#. #. #. @@ -26081,5 +26075,5 @@ #. 50000 #. -#. +#. #. #. @@ -26089,5 +26083,5 @@ #. 40000 #. -#. +#. #. #. @@ -26097,5 +26091,5 @@ #. 50000 #. -#. +#. #. #. @@ -26104,5 +26098,5 @@ #. 40000 #. -#. +#. #. #. @@ -26111,5 +26105,5 @@ #. 40000 #. -#. +#. #. #. @@ -26127,7 +26121,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26137,5 +26131,5 @@ #. 50000 #. -#. +#. #. #. @@ -26145,5 +26139,5 @@ #. 50000 #. -#. +#. #. #. @@ -26153,5 +26147,5 @@ #. 50000 #. -#. +#. #. #. @@ -26161,5 +26155,5 @@ #. 50000 #. -#. +#. #. #. @@ -26169,5 +26163,5 @@ #. 50000 #. -#. +#. #. #. @@ -26177,5 +26171,5 @@ #. 50000 #. -#. +#. #. #. @@ -26185,5 +26179,5 @@ #. 50000 #. -#. +#. #. #. @@ -26193,5 +26187,5 @@ #. 50000 #. -#. +#. #. #. @@ -26201,5 +26195,5 @@ #. 50000 #. -#. +#. #. #. @@ -26218,5 +26212,5 @@ #. 50000 #. -#. +#. #. #. @@ -26230,5 +26224,5 @@ #. 50000 #. -#. +#. #. #. @@ -26242,5 +26236,5 @@ #. 50000 #. -#. +#. #. #. @@ -26250,5 +26244,5 @@ #. 50000 #. -#. +#. #. #. @@ -26262,5 +26256,5 @@ #. 50000 #. -#. +#. #. #. @@ -26274,5 +26268,5 @@ #. 50000 #. -#. +#. #. #. @@ -26286,6 +26280,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26295,5 +26289,5 @@ #. 50000 #. -#. +#. #. #. @@ -26307,5 +26301,5 @@ #. 50000 #. -#. +#. #. #. @@ -26319,5 +26313,5 @@ #. 50000 #. -#. +#. #. #. @@ -26331,5 +26325,5 @@ #. 50000 #. -#. +#. #. #. @@ -26343,5 +26337,5 @@ #. 50000 #. -#. +#. #. #. @@ -26355,5 +26349,5 @@ #. 50000 #. -#. +#. #. #. @@ -26363,7 +26357,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26373,5 +26367,5 @@ #. 50000 #. -#. +#. #. #. @@ -26381,5 +26375,5 @@ #. 50000 #. -#. +#. #. #. @@ -26389,5 +26383,5 @@ #. 50000 #. -#. +#. #. #. @@ -26397,5 +26391,5 @@ #. 50000 #. -#. +#. #. #. @@ -26412,5 +26406,5 @@ #. 50000 #. -#. +#. #. #. @@ -26423,5 +26417,5 @@ #. 50000 #. -#. +#. #. #. @@ -26435,5 +26429,5 @@ #. 50000 #. -#. +#. #. #. @@ -26447,5 +26441,5 @@ #. 50000 #. -#. +#. #. #. @@ -26459,5 +26453,5 @@ #. 50000 #. -#. +#. #. #. @@ -26468,5 +26462,5 @@ #. 50000 #. -#. +#. #. #. @@ -26476,5 +26470,5 @@ #. 50000 #. -#. +#. #. #. @@ -26484,5 +26478,5 @@ #. 50000 #. -#. +#. #. #. @@ -26492,5 +26486,5 @@ #. 50000 #. -#. +#. #. #. @@ -26500,5 +26494,5 @@ #. 50000 #. -#. +#. #. #. @@ -26515,5 +26509,5 @@ #. 50000 #. -#. +#. #. #. @@ -26527,5 +26521,5 @@ #. 50000 #. -#. +#. #. #. @@ -26539,5 +26533,5 @@ #. 50000 #. -#. +#. #. #. @@ -26551,5 +26545,5 @@ #. 50000 #. -#. +#. #. #. @@ -26563,5 +26557,5 @@ #. 50000 #. -#. +#. #. #. @@ -26575,5 +26569,5 @@ #. 50000 #. -#. +#. #. #. @@ -26582,7 +26576,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26592,5 +26586,5 @@ #. 50000 #. -#. +#. #. #. @@ -26600,5 +26594,5 @@ #. 50000 #. -#. +#. #. #. @@ -26608,5 +26602,5 @@ #. 50000 #. -#. +#. #. #. @@ -26616,5 +26610,5 @@ #. 50000 #. -#. +#. #. #. @@ -26624,5 +26618,5 @@ #. 50000 #. -#. +#. #. #. @@ -26632,5 +26626,5 @@ #. 50000 #. -#. +#. #. #. @@ -26640,5 +26634,5 @@ #. 50000 #. -#. +#. #. #. @@ -26655,7 +26649,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26665,5 +26659,5 @@ #. 50000 #. -#. +#. #. #. @@ -26673,5 +26667,5 @@ #. 50000 #. -#. +#. #. #. @@ -26681,5 +26675,5 @@ #. 50000 #. -#. +#. #. #. @@ -26689,5 +26683,5 @@ #. 50000 #. -#. +#. #. #. @@ -26703,5 +26697,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26750,5 +26744,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26758,5 +26752,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26766,5 +26760,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26774,5 +26768,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26782,5 +26776,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26790,5 +26784,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26798,5 +26792,5 @@ #. 50000 #. -#. +#. #. #. @@ -26806,5 +26800,5 @@ #. 50000 #. -#. +#. #. #. @@ -26814,5 +26808,5 @@ #. 50000 #. -#. +#. #. #. @@ -26822,5 +26816,5 @@ #. 50000 #. -#. +#. #. #. @@ -26830,5 +26824,5 @@ #. 50000 #. -#. +#. #. #. @@ -26838,5 +26832,5 @@ #. 50000 #. -#. +#. #. #. @@ -26856,5 +26850,5 @@ #. 50000 #. -#. +#. #. #. @@ -26863,5 +26857,5 @@ #. 50000 #. -#. +#. #. #. @@ -26870,5 +26864,5 @@ #. 50000 #. -#. +#. #. #. @@ -26877,5 +26871,5 @@ #. 40000 #. -#. +#. #. #. @@ -26884,5 +26878,5 @@ #. 40000 #. -#. +#. #. #. @@ -26891,5 +26885,5 @@ #. 40000 #. -#. +#. #. #. @@ -26984,5 +26978,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -26990,28 +26984,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 @@ -27126,5 +27120,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27137,5 +27131,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27160,6 +27154,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27168,6 +27162,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27182,6 +27176,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 @@ -27195,6 +27189,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 @@ -27214,6 +27208,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27237,6 +27231,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 @@ -27248,4 +27242,61 @@ msgid "Sicily - Italy" msgstr "" + +#~ msgid "Images for {0}" +#~ msgstr "Imaxes para {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Ler GPX..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Non hai hora para o punto {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Non se puido ler a hora \"{0}\" do punto {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Non se atoparon imaxes con marcas de tempo lexibles." + +#~ msgid "GPS start: {0}" +#~ msgstr "Inicio GPS: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "Fin GPS: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "delta actual: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "Diferencia de zona horaria: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} dentro da traza." + +#~ msgid "Sync clock" +#~ msgstr "Sincronizar reloxo" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "A data no ficheiro \"{0}\" non puido ser analizada." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Non hai hora EXIF no ficheiro \"{0}\"." + +#~ msgid "Image" +#~ msgstr "Imaxe" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Zona horaria da unidade GPS (differencia coa foto)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Sincronizar hora coa da unidade GPS" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "A hora introducida non puido ser analizada." + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Abrir imaxes con AgPifoJ..." #~ msgid "Be sure to include the following information:" @@ -27262,5 +27313,4 @@ #~ msgstr "Versión descoñecida" -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Saltando unha via porque inclue un nodo que non existe: {0}\n" @@ -27268,7 +27318,4 @@ #~ msgid "Unsaved Changes" #~ msgstr "Cambios non gardados" - -#~ msgid "Please enter a search string" -#~ msgstr "Por favor introduce unha cadea de busca" #~ msgid "name" @@ -27303,5 +27350,4 @@ #~ msgstr "Mover cara abaixo" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Editor de Relación: {0}" @@ -27326,11 +27372,10 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" -#~ "Revertir o estado de todos os obxectos seleccionados actualmenete á versión " -#~ "seleccionada na lista do historial." - -#, java-format +#~ "Revertir o estado de todos os obxectos seleccionados actualmenete á " +#~ "versión seleccionada na lista do historial." + #~ msgid "Authors: {0}" #~ msgstr "Autores: {0}" @@ -27366,15 +27411,10 @@ #~ msgstr "versión final:" -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Por favor, primeiro introduce as coordenadas desexadas." - #~ msgid "Select a bookmark first." #~ msgstr "Selecciona primeiro un marcador." -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Usar ó axuste preestablecido \"{0}\" do grupo \"{1}\"" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Usar axuste preestablecido \"{0}\"" @@ -27392,12 +27432,11 @@ #~ msgstr "ID de nodo mal formada" -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" #~ "O engadido {0} semella estar estropeado ou non puido ser descargado " #~ "automáticamente." -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "O engadido require a actualización de JOSM: {0}." @@ -27408,8 +27447,7 @@ #~ msgstr "" #~ "(Podes cambiar o número de días tras os cales aparecerá esta " -#~ "advertencia
establecendoos coa opción de configuración " -#~ "'pluginmanager.warntime'.)" - -#, java-format +#~ "advertencia
establecendoos coa opción de configuración 'pluginmanager." +#~ "warntime'.)" + #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Non se puido descargar o engadido: {0} de {1}" @@ -27419,10 +27457,6 @@ #~ "about the problem." #~ msgstr "" -#~ "O engadido non puido ser eliminado. Por favor, comentalle o problema á xente " -#~ "que che propocionou JOSM." - -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Erro borrando ficheiro de engadido: {0}" +#~ "O engadido non puido ser eliminado. Por favor, comentalle o problema á " +#~ "xente que che propocionou JOSM." #~ msgid "Plugin already exists" @@ -27432,5 +27466,4 @@ #~ msgstr "Borrar e Descargar" -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -27458,15 +27491,16 @@ #~ msgstr "" #~ "As fontes (URL ou nome de ficheiro) dos ficheiros de definición de " -#~ "etiquetado preestablecido. Ver " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets para obter axuda." +#~ "etiquetado preestablecido. Ver http://josm.openstreetmap.de/wiki/" +#~ "TaggingPresets para obter axuda." #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" -#~ "ADVERTENCIA: O contrasinal é almacenado en texto plano no ficheiroo de " -#~ "preferencias.
O contrasinal é transferido ó servidor en texto plano, " -#~ "codificado na URL.
Non uses un contrasinal valioso." +#~ "ADVERTENCIA: O contrasinal é almacenado en texto plano no ficheiroo " +#~ "de preferencias.
O contrasinal é transferido ó servidor en texto " +#~ "plano, codificado na URL.
Non uses un contrasinal valioso." #~ msgid "Lambert Zone 4 cache file (.4)" @@ -27506,5 +27540,4 @@ #~ msgstr "So se poden editar páxinas de axuda da Axuda en liña de JOSM" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Erro durante a carga da páxina {0}" @@ -27520,6 +27553,6 @@ #~ "elements have a history." #~ msgstr "" -#~ "Por favor, selecciona polo menos un nodo, via ou relación. Só os elementos " -#~ "xa subidos teñen historial." +#~ "Por favor, selecciona polo menos un nodo, via ou relación. Só os " +#~ "elementos xa subidos teñen historial." #~ msgid "Merge Anyway" @@ -27531,5 +27564,6 @@ #~ msgid "Please select one or more closed ways of at least four nodes." #~ msgstr "" -#~ "Por favor, selecciona unha ou máis vias pechadas de, polo menos, catro nodos." +#~ "Por favor, selecciona unha ou máis vias pechadas de, polo menos, catro " +#~ "nodos." #~ msgid "Only two nodes allowed" @@ -27550,10 +27584,10 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" -#~ "Non se atoparon datos para actualizar. Abriches ou descargaches xa unha capa " -#~ "de datos?" - -#, java-format +#~ "Non se atoparon datos para actualizar. Abriches ou descargaches xa unha " +#~ "capa de datos?" + #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -27573,13 +27607,9 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" -#~ "Erro Interno: non se poden comprobar as condicións para ningunha capa. Por " -#~ "favor, informa disto como un erro." - -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Borrar {1} {0}" +#~ "Erro Interno: non se poden comprobar as condicións para ningunha capa. " +#~ "Por favor, informa disto como un erro." #~ msgid "Conflicting relation" @@ -27592,5 +27622,4 @@ #~ msgstr "Mover" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Non se pode abrir o directorio de preferencias: {0}" @@ -27629,5 +27658,4 @@ #~ msgstr "Público" -#, java-format #~ msgid "Checking whether node {0} is gone ..." #~ msgstr "Comprobando se o nodo {0} falta ..." @@ -27636,27 +27664,26 @@ #~ msgstr "Desfacendo o borrado da relación.." -#, java-format #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Comprobando se a primitiva {0} falta ..." -#, java-format #~ msgid "" -#~ "The OSM primitive with id {0} has been deleted
on " -#~ "the server by another mapper.

Click {1} to keep your " -#~ "primitive and ignore the deleted state.
Your primitive will be assigend a " -#~ "new id.
Click {2} to accept the state on the server and " -#~ "to delete your primitive.
Click {3} to cancel.
" +#~ "The OSM primitive with id {0} has been " +#~ "deleted
on the server by another mapper.

Click {1} to keep your primitive and ignore the deleted state.
Your " +#~ "primitive will be assigend a new id.
Click {2} to " +#~ "accept the state on the server and to delete your primitive.
Click " +#~ "{3} to cancel.
" #~ msgstr "" -#~ "A primitiva OSM coa id {0} foi borrada
no servidor " -#~ "por outro mapeador.

Fai click en {1} para conservar " -#~ "a túa primitiva e ignorar o estado de borrado.
Á túa primitiva seralle " -#~ "asignado un novo id.
Fai click en {2} para aceptar o " -#~ "estado do servidor e borrar a túa primitiva.
Fai click en " -#~ "{3} para cancelar.
" - -#, java-format +#~ "A primitiva OSM coa id {0} foi borrada
no " +#~ "servidor por outro mapeador.

Fai click en {1} " +#~ "para conservar a túa primitiva e ignorar o estado de borrado.
Á túa " +#~ "primitiva seralle asignado un novo id.
Fai click en {2} para aceptar o estado do servidor e borrar a túa primitiva." +#~ "
Fai click en {3} para cancelar.
" + #~ msgid "" -#~ "There are {0} primitives
selected for individual " -#~ "update. Please reduce the selection
to max. {1} primitives." +#~ "There are {0} primitives
selected for " +#~ "individual update. Please reduce the selection
to max. {1} primitives." +#~ "" #~ msgstr "" #~ "Hai {0} primitivas
seleccionadas para " @@ -27676,5 +27703,4 @@ #~ msgstr "Actualización fallida" -#, java-format #~ msgid "" #~ "Uploading failed because a primitive you tried " @@ -27683,6 +27709,6 @@ #~ msgstr "" #~ "A subida fallou porque a primitiva que intentou " -#~ "borrar
no servidor xa está borrada.

A mensaxe de erro " -#~ "é:
{0}" +#~ "borrar
no servidor xa está borrada.

A mensaxe de erro é:
{0}" +#~ "" #~ msgid "Conflict detected" @@ -27704,5 +27730,4 @@ #~ msgstr "vías" -#, java-format #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "Solucionar {0} conflitos en {1} obxectos" @@ -27714,5 +27739,4 @@ #~ msgstr "Combinando conflitos" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27720,5 +27744,4 @@ #~ msgstr[1] "{0} obxectos teñen conflitos:" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Conflitos: {0}" @@ -27734,20 +27757,17 @@ #~ "datos" -#, java-format #~ msgid "Help page missing. Create it in English." #~ msgstr "Páxina de axuda perdida. Créea en inglés." -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" -#~ "Páxina de axuda perdida. Créea en inglés ou galego." +#~ "Páxina de axuda perdida. Créea en inglés ou galego." #~ msgid "Didn't find an primitive with id {0} in this dataset" #~ msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos" -#, java-format #~ msgid "Unexpected return value. Got {0}." #~ msgstr "valor retornado non esperado. Obtívose {0}" Index: /applications/editors/josm/i18n/po/he.po =================================================================== --- /applications/editors/josm/i18n/po/he.po (revision 18974) +++ /applications/editors/josm/i18n/po/he.po (revision 18975) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 16:20+0100\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" "PO-Revision-Date: 2009-10-17 15:07+0000\n" "Last-Translator: Tsvi Mostovicz \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:06+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:18+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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" @@ -116,5 +115,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 @@ -137,9 +136,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 @@ -155,20 +154,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 @@ -187,7 +182,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 "שגיאה" @@ -267,5 +262,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 "תוספים" @@ -310,4 +305,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 @@ -315,8 +312,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 @@ -326,29 +323,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 @@ -377,6 +372,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 "" @@ -428,14 +423,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 "קו אורך" @@ -461,10 +456,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 @@ -495,19 +490,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 @@ -516,9 +514,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 @@ -534,7 +529,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 @@ -546,11 +541,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" @@ -638,5 +633,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}" @@ -687,10 +682,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 "נא בחר לפחות שתי דרכים לשילוב." @@ -709,19 +704,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 " @@ -733,9 +728,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 @@ -807,21 +802,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" @@ -829,6 +828,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 @@ -857,5 +856,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 "שכפל" @@ -912,8 +911,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 @@ -921,5 +918,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 @@ -932,8 +929,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 @@ -952,8 +949,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 @@ -976,13 +973,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 @@ -1022,4 +1020,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 @@ -1039,4 +1133,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" @@ -1047,26 +1182,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 "" @@ -1074,5 +1209,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" @@ -1446,6 +1581,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 "הצג דו\"ח מצב עם מידע שימושי שיכול ליהיות מצורף לבאגים" @@ -1465,9 +1599,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] "הבחירה מכילה דרך {0}. האם אתה בטוח שאתה רוצה לפשט אותה?" +msgstr[1] "הבחירה מכילה {0} דרכים. האם אתה בטוח שאתה רוצה לפשט את כולן?" + +#: ../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] "פשט דרך (הסר נקודה {0})" +msgstr[1] "פשט דרך (הסר {0} נקודות)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1590,6 +1756,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 "* נקודה אחת המשותפת ליותר מדרך אחת ואחת מהדרכים הללו, או" @@ -1665,54 +1830,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 "" @@ -1721,35 +1886,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 "" @@ -1757,28 +1922,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 "" @@ -1788,22 +1951,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 "" @@ -1814,15 +1977,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 "" @@ -1834,6 +1997,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 "" @@ -1842,38 +2005,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 "" @@ -2037,6 +2199,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 "" @@ -2105,38 +2267,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." @@ -2145,14 +2307,14 @@ msgstr[1] "הוסף נקודה חדשה ל-{0} דרכים." -#: ../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 "הפסק לצייר." @@ -2187,6 +2349,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 "" "גרור את ראש הנגינה ושחרר ליד הרצועה המבוקשת לניגון שמע ממנה; SHIFT+שחרור " @@ -2284,5 +2446,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." @@ -2367,12 +2529,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:...-כל העצמים ששונו ע\"י המשתמש" + +#: ../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 "nodes:...-עצמים עם מספר הנקודות הנתון" -#: ../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-" @@ -2380,43 +2547,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 "modified...- כל העצמים ששונו" -#: ../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 "selected - כל העצמים הבחורים" -#: ../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 "incomplete - כל העצמים הבלתי גמורים" -#: ../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 "untagged - כל העצמים הלא מתוייגים" -#: ../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 "השתמש ב-| או OR כדי לחבר ב\"או\" לוגי" -#: ../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 @@ -2426,55 +2593,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 "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\"" -#: ../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 "דבר לא הורד מהבחירה ע\"י חיפוש \"{0}\"" -#: ../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 "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2487,40 +2654,40 @@ "{2}" -#: ../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 "חסרים ארגומנטים ל-or." -#: ../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 "חסרים ארגומנטים ל-not." -#: ../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 "" @@ -2529,9 +2696,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 "" @@ -2540,5 +2707,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." @@ -2587,14 +2754,13 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" +#, fuzzy, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" msgstr "הזהרה: מגביל אוטומטית את ערך התוית \"{0}\" על גבי פרימיטיב מחוק {1}" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2732,5 +2898,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 "" @@ -2749,5 +2915,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 "" @@ -2766,19 +2933,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" @@ -2787,5 +2954,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" @@ -2794,5 +2961,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" @@ -2801,5 +2968,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" @@ -2810,15 +2977,15 @@ #. 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?" +#: ../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:451 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "" @@ -2836,15 +3003,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 "" @@ -2853,5 +3020,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}" @@ -2861,9 +3028,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 "" @@ -2943,5 +3105,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 " @@ -3084,6 +3246,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 "" @@ -3166,5 +3328,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3173,5 +3335,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3179,25 +3341,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 @@ -3220,25 +3382,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}" @@ -3246,6 +3409,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 "" @@ -3308,24 +3471,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 " @@ -3333,5 +3496,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 "" @@ -3363,6 +3526,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}." @@ -3383,5 +3546,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 @@ -3393,6 +3555,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 "" @@ -3403,135 +3564,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 "" -#: ../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 "יותר מ-\"to\" אחד נמצא." -#: ../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 "יותר מ-\"via\" אחד נמצא." -#: ../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 "" -#: ../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 "" -#: ../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 "אף דרך \"from\" לא נמצאה." -#: ../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 "אף דרך \"to\" לא נמצאה." -#: ../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 "לא נמצאה אף נקודה או דרך מסוג \"via\"" -#: ../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}" @@ -3543,5 +3704,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 @@ -3560,5 +3721,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 @@ -3578,5 +3739,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 "רקע" @@ -3694,6 +3855,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 "" @@ -3708,5 +3868,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 @@ -3714,32 +3874,32 @@ msgstr "" -#: ../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" @@ -3748,5 +3908,5 @@ msgstr[1] "{0} נקודות" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -3993,12 +4153,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 @@ -4012,19 +4172,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 @@ -4035,5 +4195,5 @@ msgstr "תפריט: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "שמע" @@ -4077,29 +4237,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 " @@ -4107,9 +4267,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 "" @@ -4215,5 +4375,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" @@ -4222,5 +4382,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" @@ -4229,5 +4389,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" @@ -4246,5 +4406,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 @@ -4261,5 +4421,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" @@ -4331,22 +4491,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." @@ -4429,6 +4589,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 "העתק את האלמנטים הנבחרים שלהם לסוף רשימת האלמנטים הממוזגים" @@ -4501,6 +4660,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" @@ -4508,6 +4667,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" @@ -4564,6 +4723,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 "" @@ -4596,7 +4755,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 "" @@ -4742,5 +4901,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 "" @@ -4875,5 +5034,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 "" @@ -4973,7 +5132,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" @@ -4983,6 +5142,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" @@ -5016,7 +5175,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 "" @@ -5105,5 +5262,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 @@ -5168,10 +5325,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 "" @@ -5246,18 +5402,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 @@ -5267,13 +5423,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 "" @@ -5466,5 +5622,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 "" @@ -5507,31 +5663,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 +msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 msgid "Click to minimize/maximize the panel content" msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל" @@ -5591,37 +5746,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 "" @@ -5630,63 +5785,91 @@ 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] "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס" + +#: ../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 "" @@ -5696,15 +5879,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 " @@ -5712,5 +5895,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 " @@ -5718,20 +5901,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 "" @@ -5740,66 +5923,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 " @@ -5808,53 +5995,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 "" @@ -5864,41 +6057,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 "" @@ -5938,19 +6124,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}''" @@ -5962,6 +6148,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 "" @@ -6140,7 +6325,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 "" @@ -6913,5 +7097,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 @@ -7148,6 +7332,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 "" @@ -7157,6 +7341,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 "" @@ -7419,13 +7603,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}" @@ -7526,6 +7710,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 "" @@ -7610,6 +7793,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] "" @@ -7623,6 +7806,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 " @@ -7677,5 +7860,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 " @@ -7683,5 +7866,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 "" @@ -7754,40 +7937,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:" @@ -7796,5 +7979,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:" @@ -7803,5 +7986,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:" @@ -7810,68 +7993,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 +#: ../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}" @@ -7879,16 +8061,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}." @@ -7896,6 +8078,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 "" @@ -7904,5 +8086,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 "" @@ -7932,111 +8114,55 @@ 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 "התחלת GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "סיום GPS: {0}" - -#: ../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] "תמונות" - -#: ../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 "תמונות JPEG (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "לא ניתן לנתח את התאריך שבקובץ \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"." - -#: ../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 "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "אזור זמן של יחידת GPS (הבדל מתמונה)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "סנכרן את השעה עם יחידת ה-GPS" - -#: ../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} מטרים" + +#: ../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 @@ -8044,30 +8170,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 @@ -8075,5 +8201,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 @@ -8082,5 +8208,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 @@ -8089,58 +8215,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 "תמונות JPEG (*.jpg)" + +#: ../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 @@ -8148,5 +8279,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" @@ -8156,5 +8287,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 @@ -8162,22 +8293,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, " @@ -8186,5 +8312,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" @@ -8193,24 +8319,24 @@ msgstr[1] "{0} נקודות דרך" -#: ../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:" +#: ../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 "" "העלאת קובץ נתוני GPS לא מעובדים נחשבת מזיקה.
אם אתה רוצה להעלות " "מסלולים, ראה כאן:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8220,29 +8346,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 "" @@ -8250,12 +8376,12 @@ "wish
to continue?" msgstr "" -"הפעולה הזו דורשת {0} בקשות
הורדה נפרדות. האם אתה " -"רוצה
להמשיך?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 +"הפעולה הזו דורשת {0} בקשות
הורדה נפרדות. האם אתה רוצה
להמשיך?" + +#: ../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 " @@ -8263,5 +8389,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 " @@ -8271,23 +8397,23 @@ "באופן הגיוני הושמטו." -#: ../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 "גירסה {0}" -#: ../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." @@ -8296,5 +8422,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 "" @@ -8308,5 +8434,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 "" @@ -8319,11 +8445,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" @@ -8332,32 +8458,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 "גירסת API: {0}" -#: ../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 "המר לשכבת GPX" -#: ../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 "" @@ -8365,6 +8491,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 "" @@ -8403,4 +8529,351 @@ msgstr[1] "{0} נקודות" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "קבצי GPX‏ (*.gpx *.gpx.gz)" + +#: ../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 "זמן צילום (מ-EXIF)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "זמן GPS (נקרא מהצילום למעלה): " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [dd/mm/yyyy hh:mm:ss]" + +#: ../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 "תמונות ללא מיקום exif" + +#: ../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 "" +"שגיאה בזמן ניתוח אזור זמן.\n" +"פורמט מצופה: {0}" + +#: ../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 "" +"שגיאה בזמן ניתוח היסט.\n" +"פורמט מצופה: {0}" + +#: ../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 "מחלץ מיקומי GPS מ-EXIF" + +#: ../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 "לא יכול לקבל נתיב קנוני לתיקייה {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "קורא ספרייה {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "נמצא קובץ null בתיקייה {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n" + +#: ../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] "תמונות" + +#: ../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 "טוען {0}" + +#: ../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 "שגיאה בקובץ {0}" + +#: ../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 "" +"\n" +"רום: {0} מ'" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} קמ\"ש" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8698,5 +9171,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 @@ -8888,6 +9361,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 "צייר את חצי הכיוון תוך שימוש בטבלת חיפוש במקום חישובים מסובכים." @@ -8946,6 +9418,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 "" @@ -9013,19 +9484,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 @@ -9284,6 +9755,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 "" @@ -9346,6 +9817,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 "" @@ -9358,9 +9829,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 "" @@ -9384,6 +9854,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 "" @@ -9476,5 +9946,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 "עוד מידע על הכלי הזה" @@ -9561,5 +10031,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 @@ -9567,5 +10037,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9685,14 +10155,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 @@ -9720,24 +10189,31 @@ 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}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9779,27 +10255,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 "" @@ -9807,66 +10283,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}." @@ -9901,5 +10377,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}''." @@ -9926,5 +10402,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}." @@ -9932,5 +10408,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}" @@ -9943,5 +10419,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}''." @@ -9999,7 +10475,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 "" @@ -10027,6 +10503,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 "" @@ -10092,46 +10568,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 "" @@ -10139,19 +10614,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 "" @@ -10161,8 +10636,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 "" @@ -10172,25 +10647,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 "" @@ -10198,5 +10673,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10205,5 +10680,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10211,5 +10686,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10218,13 +10693,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 "מכין נתוני OSM..." -#: ../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 "" @@ -10277,4 +10752,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 @@ -10312,42 +10793,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 "" @@ -10389,17 +10871,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:139 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 +#, java-format +msgid "Delete old plugin {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "שגיאה במחיקת קובץ התוסף: {0}" + +#: ../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}." @@ -10411,19 +10903,18 @@ msgstr "אירעה שגיאה בתוסף {0}" -#: ../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" @@ -10432,50 +10923,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 "התוסף עודכן לאחרונה לפני {0} ימים." -#: ../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 "התוסף {0} דרוש ע\"י התוסף {1} אך אינו נמצא." -#: ../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 "תוסף לא נמצא: {0}" -#: ../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 "לא יכול לטעון את התוסף {0}. למחוק מהמאפיינים?" -#: ../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 " @@ -10485,9 +10976,9 @@ "הקיימים." -#: ../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 "" @@ -10495,19 +10986,19 @@ msgstr "שגיאה בלתי צפויה אירעה שנובעת כנראה מהתוסף \"{0}\"." -#: ../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 "לפי המידע בתוסף, המחבר הוא {0}." -#: ../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 " @@ -10515,13 +11006,13 @@ msgstr "התוסף הוסר מהתצורה. אתחל מחדש את JOSM להסרת התוסף." -#: ../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" @@ -10640,6 +11131,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 "" @@ -10677,6 +11168,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 "" @@ -10738,7 +11229,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 "" @@ -10750,7 +11240,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 "" @@ -10782,6 +11272,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 "" @@ -11039,5 +11529,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" @@ -11052,12 +11542,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 @@ -11065,449 +11553,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 +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 "" -"\n" -"רום: {0} מ'" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} קמ\"ש" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "מחלץ מיקומי GPS מ-EXIF" - -#: ../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 "לא יכול לקבל נתיב קנוני לתיקייה {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "קורא ספרייה {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "נמצא קובץ null בתיקייה {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n" - -#: ../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 "פותח תמונות ב-AgPifoJ..." - -#: ../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 "קבצי GPX‏ (*.gpx *.gpx.gz)" - -#: ../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 "זמן צילום (מ-EXIF)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "זמן GPS (נקרא מהצילום למעלה): " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [dd/mm/yyyy hh:mm:ss]" - -#: ../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 "תמונות ללא מיקום exif" - -#: ../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 "" -"שגיאה בזמן ניתוח אזור זמן.\n" -"פורמט מצופה: {0}" - -#: ../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 "" -"שגיאה בזמן ניתוח היסט.\n" -"פורמט מצופה: {0}" - -#: ../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 "טוען {0}" - -#: ../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 "שגיאה בקובץ {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11651,11 +11833,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 "" @@ -11961,12 +12142,4 @@ msgid "Export as PNG format (only raster images)" 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] "פשט דרך (הסר נקודה {0})" -msgstr[1] "פשט דרך (הסר {0} נקודות)" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 @@ -12079,14 +12252,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 " @@ -12394,4 +12567,8 @@ msgstr "פתח תמונות עם ImageWayPoint" +#: ../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" @@ -12435,18 +12612,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" @@ -12495,7 +12672,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12505,5 +12682,5 @@ #. 50000 #. -#. +#. #. #. @@ -12513,5 +12690,5 @@ #. 50000 #. -#. +#. #. #. @@ -12520,5 +12697,5 @@ #. 50000 #. -#. +#. #. #. @@ -12528,5 +12705,5 @@ #. 50000 #. -#. +#. #. #. @@ -12604,6 +12781,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 "" @@ -12623,7 +12799,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 "" "הדיוק של פישוט קו דאגלס-פאוקר, נמדד במעלות.
ערכים נמוכים נותנים יותר " @@ -12687,20 +12862,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 "ההתחברות נכשלה" @@ -12917,6 +13091,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 "" @@ -12997,9 +13170,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 " @@ -13008,9 +13182,5 @@ "Firefox לא נמצא. קבע את קובץ ההרצה של Firefox בדף Map Settings של המאפיינים." -#: ../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 "קובץ הרצת פיירפוקס" @@ -13385,17 +13555,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 "" @@ -13439,160 +13609,4 @@ msgid "Optional" 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] "הבחירה מכילה דרך {0}. האם אתה בטוח שאתה רוצה לפשט אותה?" -msgstr[1] "הבחירה מכילה {0} דרכים. האם אתה בטוח שאתה רוצה לפשט את כולן?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "האם אתה בטוח?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13690,5 +13704,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}" @@ -13741,34 +13755,34 @@ msgstr "התעלם מהשגיאות הבחורות בעתיד." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../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:197 +#: ../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:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "כלום" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "התעלם מקבוצה שלמה או אלמנטים בודדים?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 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 "" @@ -13817,18 +13831,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 "" @@ -14059,7 +14073,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 "" @@ -14202,5 +14215,5 @@ #. 50000 #. -#. +#. #. #. @@ -14208,5 +14221,5 @@ #. #. -#. +#. #. #. @@ -14216,5 +14229,5 @@ #. 50000 #. -#. +#. #. #. @@ -14223,5 +14236,5 @@ #. 50000 #. -#. +#. #. #. @@ -14230,5 +14243,5 @@ #. 50000 #. -#. +#. #. #. @@ -14237,5 +14250,5 @@ #. 50000 #. -#. +#. #. #. @@ -14244,5 +14257,5 @@ #. 50000 #. -#. +#. #. #. @@ -14251,9 +14264,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14298,5 +14311,5 @@ #. 50000 #. -#. +#. #. #. @@ -14429,14 +14442,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 " @@ -14445,14 +14458,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 "" @@ -14461,5 +14474,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 "" @@ -14471,13 +14484,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." @@ -14631,50 +14644,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 "שמור שכבת WMS לקובץ" -#: ../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 "טען שכבת WMS מקובץ" -#: ../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 "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}" -#: ../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 "" @@ -14750,5 +14763,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 "" @@ -14756,6 +14769,6 @@ "area, or use planet.osm" msgstr "" -"ביקשת יותר מידי נקודות (מוגבל ל 50,000). בקש שטח קטן יותר או השתמש ב " -"planet.osm" +"ביקשת יותר מידי נקודות (מוגבל ל 50,000). בקש שטח קטן יותר או השתמש ב planet." +"osm" #. OSM server message @@ -14788,21 +14801,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 " @@ -14814,21 +14822,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 " @@ -14837,10 +14845,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 " @@ -14849,21 +14857,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 " @@ -14873,16 +14880,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 " @@ -14892,10 +14899,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 " @@ -14904,5 +14911,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 " @@ -14912,27 +14919,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 " @@ -14941,15 +14948,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 +msgid "Let other applications send commands to JOSM." +msgstr "" + +#. Plugin routes #: build/trans_plugins.java:55 -msgid "Let other applications send commands to JOSM." -msgstr "" - -#. Plugin routes -#: build/trans_plugins.java:57 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -14958,10 +14965,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 " @@ -14970,15 +14977,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 " @@ -14988,17 +14995,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 " @@ -15007,5 +15007,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15014,10 +15014,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, ...)." @@ -16070,8 +16070,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16268,5 +16268,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16276,5 +16276,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16293,5 +16293,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16301,5 +16301,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16318,5 +16318,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16326,5 +16326,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16343,5 +16343,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16351,5 +16351,5 @@ #. 300000 #. -#. +#. #. #. @@ -16364,5 +16364,5 @@ #. 300000 #. -#. +#. #. #. @@ -16380,5 +16380,5 @@ #. 50000 #. -#. +#. #. #. @@ -16396,5 +16396,5 @@ #. 40000 #. -#. +#. #. #. @@ -16403,5 +16403,5 @@ #. 40000 #. -#. +#. #. #. @@ -16411,5 +16411,5 @@ #. 50000 #. -#. +#. #. #. @@ -16429,5 +16429,5 @@ #. 50000 #. -#. +#. #. #. @@ -16436,5 +16436,5 @@ #. 50000 #. -#. +#. #. #. @@ -16444,5 +16444,5 @@ #. 50000 #. -#. +#. #. #. @@ -16492,7 +16492,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17191,5 +17191,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17228,5 +17228,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17322,5 +17322,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17477,5 +17477,5 @@ #. 50000 #. -#. +#. #. #. @@ -18862,5 +18862,5 @@ #. 30000 #. -#. +#. #. #. @@ -18870,5 +18870,5 @@ #. 40000 #. -#. +#. #. #. @@ -18878,5 +18878,5 @@ #. 20000 #. -#. +#. #. #. @@ -18886,5 +18886,5 @@ #. 40000 #. -#. +#. #. #. @@ -19242,7 +19242,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19252,5 +19252,5 @@ #. 50000 #. -#. +#. #. #. @@ -19260,5 +19260,5 @@ #. 50000 #. -#. +#. #. #. @@ -19268,5 +19268,5 @@ #. 50000 #. -#. +#. #. #. @@ -19276,5 +19276,5 @@ #. 50000 #. -#. +#. #. #. @@ -19284,5 +19284,5 @@ #. 50000 #. -#. +#. #. #. @@ -19292,5 +19292,5 @@ #. 50000 #. -#. +#. #. #. @@ -19300,5 +19300,5 @@ #. 50000 #. -#. +#. #. #. @@ -19308,5 +19308,5 @@ #. 50000 #. -#. +#. #. #. @@ -19316,5 +19316,5 @@ #. 50000 #. -#. +#. #. #. @@ -19324,5 +19324,5 @@ #. 50000 #. -#. +#. #. #. @@ -19332,5 +19332,5 @@ #. 50000 #. -#. +#. #. #. @@ -19340,5 +19340,5 @@ #. 50000 #. -#. +#. #. #. @@ -19348,5 +19348,5 @@ #. 50000 #. -#. +#. #. #. @@ -19356,5 +19356,5 @@ #. 50000 #. -#. +#. #. #. @@ -19364,5 +19364,5 @@ #. 50000 #. -#. +#. #. #. @@ -19372,5 +19372,5 @@ #. 50000 #. -#. +#. #. #. @@ -19380,5 +19380,5 @@ #. 50000 #. -#. +#. #. #. @@ -19388,5 +19388,5 @@ #. 50000 #. -#. +#. #. #. @@ -19396,5 +19396,5 @@ #. 50000 #. -#. +#. #. #. @@ -19404,5 +19404,5 @@ #. 50000 #. -#. +#. #. #. @@ -19412,5 +19412,5 @@ #. 50000 #. -#. +#. #. #. @@ -19420,5 +19420,5 @@ #. 50000 #. -#. +#. #. #. @@ -19428,5 +19428,5 @@ #. 50000 #. -#. +#. #. #. @@ -19436,5 +19436,5 @@ #. 50000 #. -#. +#. #. #. @@ -19444,5 +19444,5 @@ #. 50000 #. -#. +#. #. #. @@ -19452,5 +19452,5 @@ #. 50000 #. -#. +#. #. #. @@ -19460,5 +19460,5 @@ #. 50000 #. -#. +#. #. #. @@ -19468,5 +19468,5 @@ #. 50000 #. -#. +#. #. #. @@ -19476,5 +19476,5 @@ #. 50000 #. -#. +#. #. #. @@ -19484,5 +19484,5 @@ #. 50000 #. -#. +#. #. #. @@ -19492,5 +19492,5 @@ #. 50000 #. -#. +#. #. #. @@ -19500,5 +19500,5 @@ #. 50000 #. -#. +#. #. #. @@ -19508,5 +19508,5 @@ #. 50000 #. -#. +#. #. #. @@ -19516,5 +19516,5 @@ #. 50000 #. -#. +#. #. #. @@ -19524,5 +19524,5 @@ #. 50000 #. -#. +#. #. #. @@ -19532,5 +19532,5 @@ #. 50000 #. -#. +#. #. #. @@ -19540,5 +19540,5 @@ #. 50000 #. -#. +#. #. #. @@ -19548,5 +19548,5 @@ #. 50000 #. -#. +#. #. #. @@ -19556,5 +19556,5 @@ #. 50000 #. -#. +#. #. #. @@ -19564,5 +19564,5 @@ #. 50000 #. -#. +#. #. #. @@ -19572,5 +19572,5 @@ #. 50000 #. -#. +#. #. #. @@ -19580,5 +19580,5 @@ #. 50000 #. -#. +#. #. #. @@ -19588,5 +19588,5 @@ #. 50000 #. -#. +#. #. #. @@ -19596,5 +19596,5 @@ #. 50000 #. -#. +#. #. #. @@ -19604,5 +19604,5 @@ #. 50000 #. -#. +#. #. #. @@ -19612,5 +19612,5 @@ #. 50000 #. -#. +#. #. #. @@ -21304,7 +21304,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21314,5 +21314,5 @@ #. 50000 #. -#. +#. #. #. @@ -21322,5 +21322,5 @@ #. 50000 #. -#. +#. #. #. @@ -21330,5 +21330,5 @@ #. 50000 #. -#. +#. #. #. @@ -21338,5 +21338,5 @@ #. 50000 #. -#. +#. #. #. @@ -21346,5 +21346,5 @@ #. 50000 #. -#. +#. #. #. @@ -21354,5 +21354,5 @@ #. 50000 #. -#. +#. #. #. @@ -21362,5 +21362,5 @@ #. 50000 #. -#. +#. #. #. @@ -22691,5 +22691,5 @@ #. 40000 #. -#. +#. #. #. @@ -22705,5 +22705,5 @@ #. 30000 #. -#. +#. #. #. @@ -22714,7 +22714,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22724,5 +22724,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22732,13 +22740,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22748,5 +22748,5 @@ #. 50000 #. -#. +#. #. #. @@ -22779,5 +22779,5 @@ #. 50000 #. -#. +#. #. #. @@ -22793,5 +22793,5 @@ #. 50000 #. -#. +#. #. #. @@ -22801,5 +22801,5 @@ #. 10000 #. -#. +#. #. #. @@ -22809,5 +22809,5 @@ #. 10000 #. -#. +#. #. #. @@ -22818,5 +22818,5 @@ #. 10000 #. -#. +#. #. #. @@ -22845,5 +22845,5 @@ #. 50000 #. -#. +#. #. #. @@ -22958,9 +22958,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 @@ -22968,5 +22968,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, @@ -22976,8 +22976,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 @@ -22991,5 +22991,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -22997,5 +22997,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23044,6 +23044,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23123,5 +23123,5 @@ #. 40000 #. -#. +#. #. #. @@ -23131,5 +23131,5 @@ #. 10000 #. -#. +#. #. #. @@ -23138,5 +23138,5 @@ #. 50000 #. -#. +#. #. #. @@ -23146,5 +23146,5 @@ #. 50000 #. -#. +#. #. #. @@ -23153,5 +23153,5 @@ #. 50000 #. -#. +#. #. #. @@ -23160,5 +23160,5 @@ #. 50000 #. -#. +#. #. #. @@ -23167,5 +23167,5 @@ #. 50000 #. -#. +#. #. #. @@ -23174,5 +23174,5 @@ #. 50000 #. -#. +#. #. #. @@ -23181,5 +23181,5 @@ #. 40000 #. -#. +#. #. #. @@ -23188,5 +23188,5 @@ #. 50000 #. -#. +#. #. #. @@ -23195,5 +23195,5 @@ #. 50000 #. -#. +#. #. #. @@ -23202,5 +23202,5 @@ #. 50000 #. -#. +#. #. #. @@ -23209,5 +23209,5 @@ #. 50000 #. -#. +#. #. #. @@ -23216,5 +23216,5 @@ #. 50000 #. -#. +#. #. #. @@ -23223,5 +23223,5 @@ #. 50000 #. -#. +#. #. #. @@ -23231,5 +23231,5 @@ #. 50000 #. -#. +#. #. #. @@ -23238,5 +23238,5 @@ #. 50000 #. -#. +#. #. #. @@ -23247,5 +23247,5 @@ #. 50000 #. -#. +#. #. #. @@ -23257,11 +23257,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23270,7 +23270,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23281,5 +23281,5 @@ #. 50000 #. -#. +#. #. #. @@ -23290,5 +23290,5 @@ #. 50000 #. -#. +#. #. #. @@ -23299,5 +23299,5 @@ #. 50000 #. -#. +#. #. #. @@ -23308,5 +23308,5 @@ #. 50000 #. -#. +#. #. #. @@ -23317,5 +23317,5 @@ #. 50000 #. -#. +#. #. #. @@ -23326,5 +23326,5 @@ #. 40000 #. -#. +#. #. #. @@ -23336,5 +23336,5 @@ #. 50000 #. -#. +#. #. #. @@ -23345,5 +23345,5 @@ #. 50000 #. -#. +#. #. #. @@ -23368,5 +23368,5 @@ #. 10000 #. -#. +#. #. #. @@ -23375,5 +23375,5 @@ #. 50000 #. -#. +#. #. #. @@ -23382,5 +23382,5 @@ #. 50000 #. -#. +#. #. #. @@ -23396,5 +23396,5 @@ #. 20000 #. -#. +#. #. #. @@ -23408,5 +23408,5 @@ #. 30000 #. -#. +#. #. #. @@ -23415,5 +23415,5 @@ #. 50000 #. -#. +#. #. #. @@ -23422,5 +23422,5 @@ #. 50000 #. -#. +#. #. #. @@ -23429,5 +23429,5 @@ #. 50000 #. -#. +#. #. #. @@ -23436,5 +23436,5 @@ #. 50000 #. -#. +#. #. #. @@ -23443,5 +23443,5 @@ #. 50000 #. -#. +#. #. #. @@ -23450,5 +23450,5 @@ #. 50000 #. -#. +#. #. #. @@ -23457,5 +23457,5 @@ #. 50000 #. -#. +#. #. #. @@ -23464,5 +23464,5 @@ #. 50000 #. -#. +#. #. #. @@ -23471,5 +23471,5 @@ #. 50000 #. -#. +#. #. #. @@ -23478,5 +23478,5 @@ #. 50000 #. -#. +#. #. #. @@ -23485,5 +23485,5 @@ #. 50000 #. -#. +#. #. #. @@ -23492,5 +23492,5 @@ #. 50000 #. -#. +#. #. #. @@ -23499,5 +23499,5 @@ #. 50000 #. -#. +#. #. #. @@ -23506,5 +23506,5 @@ #. 50000 #. -#. +#. #. #. @@ -23675,7 +23675,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23689,5 +23689,5 @@ #. 40000 #. -#. +#. #. #. @@ -23697,7 +23697,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23707,5 +23707,5 @@ #. 50000 #. -#. +#. #. #. @@ -23715,5 +23715,5 @@ #. 50000 #. -#. +#. #. #. @@ -23723,5 +23723,5 @@ #. 50000 #. -#. +#. #. #. @@ -23731,5 +23731,5 @@ #. 50000 #. -#. +#. #. #. @@ -23745,5 +23745,5 @@ #. 10000 #. -#. +#. #. #. @@ -23753,5 +23753,5 @@ #. 50000 #. -#. +#. #. #. @@ -23761,5 +23761,5 @@ #. 50000 #. -#. +#. #. #. @@ -23769,5 +23769,5 @@ #. 50000 #. -#. +#. #. #. @@ -23777,5 +23777,5 @@ #. 50000 #. -#. +#. #. #. @@ -23785,5 +23785,5 @@ #. 50000 #. -#. +#. #. #. @@ -23793,5 +23793,5 @@ #. 50000 #. -#. +#. #. #. @@ -23810,5 +23810,5 @@ #. 50000 #. -#. +#. #. #. @@ -23817,5 +23817,5 @@ #. 50000 #. -#. +#. #. #. @@ -23829,5 +23829,5 @@ #. 50000 #. -#. +#. #. #. @@ -23841,5 +23841,5 @@ #. 50000 #. -#. +#. #. #. @@ -23848,5 +23848,5 @@ #. 50000 #. -#. +#. #. #. @@ -23860,5 +23860,5 @@ #. 50000 #. -#. +#. #. #. @@ -23873,5 +23873,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23886,5 +23886,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23898,5 +23898,5 @@ #. 50000 #. -#. +#. #. #. @@ -23910,5 +23910,5 @@ #. 50000 #. -#. +#. #. #. @@ -23917,5 +23917,5 @@ #. 50000 #. -#. +#. #. #. @@ -23924,5 +23924,5 @@ #. 50000 #. -#. +#. #. #. @@ -23936,5 +23936,5 @@ #. 50000 #. -#. +#. #. #. @@ -23944,5 +23944,5 @@ #. 50000 #. -#. +#. #. #. @@ -23951,5 +23951,5 @@ #. 50000 #. -#. +#. #. #. @@ -23958,5 +23958,5 @@ #. 50000 #. -#. +#. #. #. @@ -23965,5 +23965,5 @@ #. 50000 #. -#. +#. #. #. @@ -23973,5 +23973,5 @@ #. 50000 #. -#. +#. #. #. @@ -23982,5 +23982,5 @@ #. 50000 #. -#. +#. #. #. @@ -23990,7 +23990,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24000,5 +24000,5 @@ #. 50000 #. -#. +#. #. #. @@ -24008,5 +24008,5 @@ #. 50000 #. -#. +#. #. #. @@ -24016,5 +24016,5 @@ #. 50000 #. -#. +#. #. #. @@ -24025,5 +24025,5 @@ #. 50000 #. -#. +#. #. #. @@ -24033,5 +24033,5 @@ #. 50000 #. -#. +#. #. #. @@ -24041,5 +24041,5 @@ #. 50000 #. -#. +#. #. #. @@ -24049,5 +24049,5 @@ #. 50000 #. -#. +#. #. #. @@ -24057,5 +24057,5 @@ #. 50000 #. -#. +#. #. #. @@ -24065,5 +24065,5 @@ #. 50000 #. -#. +#. #. #. @@ -24073,5 +24073,5 @@ #. 50000 #. -#. +#. #. #. @@ -24081,5 +24081,5 @@ #. 50000 #. -#. +#. #. #. @@ -24089,5 +24089,5 @@ #. 50000 #. -#. +#. #. #. @@ -24110,7 +24110,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24120,5 +24120,5 @@ #. 50000 #. -#. +#. #. #. @@ -24127,5 +24127,5 @@ #. 50000 #. -#. +#. #. #. @@ -24135,5 +24135,5 @@ #. 50000 #. -#. +#. #. #. @@ -24142,5 +24142,5 @@ #. 50000 #. -#. +#. #. #. @@ -24150,5 +24150,5 @@ #. 50000 #. -#. +#. #. #. @@ -24158,5 +24158,5 @@ #. 50000 #. -#. +#. #. #. @@ -24172,5 +24172,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24181,5 +24181,5 @@ #. 50000 #. -#. +#. #. #. @@ -24198,5 +24198,5 @@ #. 50000 #. -#. +#. #. #. @@ -24206,5 +24206,5 @@ #. 50000 #. -#. +#. #. #. @@ -24217,5 +24217,5 @@ #. 50000 #. -#. +#. #. #. @@ -24233,5 +24233,5 @@ #. 50000 #. -#. +#. #. #. @@ -24240,5 +24240,5 @@ #. 50000 #. -#. +#. #. #. @@ -24247,5 +24247,5 @@ #. 50000 #. -#. +#. #. #. @@ -24254,7 +24254,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24265,5 +24265,5 @@ #. 50000 #. -#. +#. #. #. @@ -24278,5 +24278,5 @@ #. 50000 #. -#. +#. #. #. @@ -24290,5 +24290,5 @@ #. 50000 #. -#. +#. #. #. @@ -24298,5 +24298,5 @@ #. 50000 #. -#. +#. #. #. @@ -24310,5 +24310,5 @@ #. 50000 #. -#. +#. #. #. @@ -24322,5 +24322,5 @@ #. 50000 #. -#. +#. #. #. @@ -24329,7 +24329,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24339,5 +24339,5 @@ #. 50000 #. -#. +#. #. #. @@ -24347,5 +24347,5 @@ #. 50000 #. -#. +#. #. #. @@ -24355,5 +24355,5 @@ #. 50000 #. -#. +#. #. #. @@ -24363,5 +24363,5 @@ #. 50000 #. -#. +#. #. #. @@ -24377,7 +24377,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24392,5 +24392,5 @@ #. 30000 #. -#. +#. #. #. @@ -24405,5 +24405,5 @@ #. 30000 #. -#. +#. #. #. @@ -24418,5 +24418,5 @@ #. 30000 #. -#. +#. #. #. @@ -24431,5 +24431,5 @@ #. 30000 #. -#. +#. #. #. @@ -24444,5 +24444,5 @@ #. 30000 #. -#. +#. #. #. @@ -24457,7 +24457,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24467,5 +24467,5 @@ #. 50000 #. -#. +#. #. #. @@ -24474,5 +24474,5 @@ #. 50000 #. -#. +#. #. #. @@ -24482,5 +24482,5 @@ #. 50000 #. -#. +#. #. #. @@ -24490,5 +24490,5 @@ #. 50000 #. -#. +#. #. #. @@ -24498,5 +24498,5 @@ #. 50000 #. -#. +#. #. #. @@ -24506,5 +24506,5 @@ #. 50000 #. -#. +#. #. #. @@ -24514,5 +24514,5 @@ #. 50000 #. -#. +#. #. #. @@ -24522,5 +24522,5 @@ #. 50000 #. -#. +#. #. #. @@ -24530,5 +24530,5 @@ #. 50000 #. -#. +#. #. #. @@ -24538,5 +24538,5 @@ #. 50000 #. -#. +#. #. #. @@ -24546,5 +24546,5 @@ #. 50000 #. -#. +#. #. #. @@ -24554,5 +24554,5 @@ #. 50000 #. -#. +#. #. #. @@ -24562,5 +24562,5 @@ #. 50000 #. -#. +#. #. #. @@ -24580,5 +24580,5 @@ #. 50000 #. -#. +#. #. #. @@ -24593,5 +24593,5 @@ #. 50000 #. -#. +#. #. #. @@ -24604,7 +24604,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24614,5 +24614,5 @@ #. 50000 #. -#. +#. #. #. @@ -24622,5 +24622,5 @@ #. 50000 #. -#. +#. #. #. @@ -24630,5 +24630,5 @@ #. 50000 #. -#. +#. #. #. @@ -24638,5 +24638,5 @@ #. 50000 #. -#. +#. #. #. @@ -24646,5 +24646,5 @@ #. 50000 #. -#. +#. #. #. @@ -24654,5 +24654,5 @@ #. 50000 #. -#. +#. #. #. @@ -24662,5 +24662,5 @@ #. 50000 #. -#. +#. #. #. @@ -24670,5 +24670,5 @@ #. 50000 #. -#. +#. #. #. @@ -24678,5 +24678,5 @@ #. 50000 #. -#. +#. #. #. @@ -24686,5 +24686,5 @@ #. 50000 #. -#. +#. #. #. @@ -24694,5 +24694,5 @@ #. 50000 #. -#. +#. #. #. @@ -24702,5 +24702,5 @@ #. 50000 #. -#. +#. #. #. @@ -24710,5 +24710,5 @@ #. 50000 #. -#. +#. #. #. @@ -24718,5 +24718,5 @@ #. 50000 #. -#. +#. #. #. @@ -24737,5 +24737,5 @@ #. 50000 #. -#. +#. #. #. @@ -24749,7 +24749,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24759,5 +24759,5 @@ #. 50000 #. -#. +#. #. #. @@ -24767,5 +24767,5 @@ #. 50000 #. -#. +#. #. #. @@ -24775,5 +24775,5 @@ #. 50000 #. -#. +#. #. #. @@ -24783,5 +24783,5 @@ #. 50000 #. -#. +#. #. #. @@ -24791,5 +24791,5 @@ #. 50000 #. -#. +#. #. #. @@ -24799,5 +24799,5 @@ #. 50000 #. -#. +#. #. #. @@ -24807,5 +24807,5 @@ #. 50000 #. -#. +#. #. #. @@ -24822,5 +24822,5 @@ #. 50000 #. -#. +#. #. #. @@ -24830,5 +24830,5 @@ #. 50000 #. -#. +#. #. #. @@ -24838,5 +24838,5 @@ #. 50000 #. -#. +#. #. #. @@ -24846,5 +24846,5 @@ #. 50000 #. -#. +#. #. #. @@ -24854,5 +24854,5 @@ #. 50000 #. -#. +#. #. #. @@ -24862,5 +24862,5 @@ #. 50000 #. -#. +#. #. #. @@ -24870,5 +24870,5 @@ #. 50000 #. -#. +#. #. #. @@ -24878,5 +24878,5 @@ #. 50000 #. -#. +#. #. #. @@ -24886,5 +24886,5 @@ #. 50000 #. -#. +#. #. #. @@ -24894,5 +24894,5 @@ #. 50000 #. -#. +#. #. #. @@ -24902,5 +24902,5 @@ #. 50000 #. -#. +#. #. #. @@ -24910,5 +24910,5 @@ #. 50000 #. -#. +#. #. #. @@ -24927,5 +24927,5 @@ #. 50000 #. -#. +#. #. #. @@ -24935,5 +24935,5 @@ #. 50000 #. -#. +#. #. #. @@ -24942,5 +24942,5 @@ #. 50000 #. -#. +#. #. #. @@ -24950,5 +24950,5 @@ #. 50000 #. -#. +#. #. #. @@ -24958,5 +24958,5 @@ #. 50000 #. -#. +#. #. #. @@ -24966,5 +24966,5 @@ #. 50000 #. -#. +#. #. #. @@ -24973,5 +24973,5 @@ #. 50000 #. -#. +#. #. #. @@ -24981,5 +24981,5 @@ #. 50000 #. -#. +#. #. #. @@ -24989,5 +24989,5 @@ #. 50000 #. -#. +#. #. #. @@ -24997,5 +24997,5 @@ #. 50000 #. -#. +#. #. #. @@ -25005,5 +25005,5 @@ #. 50000 #. -#. +#. #. #. @@ -25012,5 +25012,5 @@ #. 50000 #. -#. +#. #. #. @@ -25019,5 +25019,5 @@ #. 50000 #. -#. +#. #. #. @@ -25026,5 +25026,5 @@ #. 50000 #. -#. +#. #. #. @@ -25033,5 +25033,5 @@ #. 50000 #. -#. +#. #. #. @@ -25040,5 +25040,5 @@ #. 50000 #. -#. +#. #. #. @@ -25047,5 +25047,5 @@ #. 50000 #. -#. +#. #. #. @@ -25054,5 +25054,5 @@ #. 50000 #. -#. +#. #. #. @@ -25061,5 +25061,5 @@ #. 50000 #. -#. +#. #. #. @@ -25068,5 +25068,5 @@ #. 50000 #. -#. +#. #. #. @@ -25075,5 +25075,5 @@ #. 50000 #. -#. +#. #. #. @@ -25082,5 +25082,5 @@ #. 50000 #. -#. +#. #. #. @@ -25089,5 +25089,5 @@ #. 50000 #. -#. +#. #. #. @@ -25096,5 +25096,5 @@ #. 50000 #. -#. +#. #. #. @@ -25104,5 +25104,5 @@ #. 50000 #. -#. +#. #. #. @@ -25112,5 +25112,5 @@ #. 50000 #. -#. +#. #. #. @@ -25120,5 +25120,5 @@ #. 50000 #. -#. +#. #. #. @@ -25128,5 +25128,5 @@ #. 50000 #. -#. +#. #. #. @@ -25136,5 +25136,5 @@ #. 50000 #. -#. +#. #. #. @@ -25144,5 +25144,5 @@ #. 50000 #. -#. +#. #. #. @@ -25152,5 +25152,5 @@ #. 50000 #. -#. +#. #. #. @@ -25160,5 +25160,5 @@ #. 50000 #. -#. +#. #. #. @@ -25168,5 +25168,5 @@ #. 50000 #. -#. +#. #. #. @@ -25177,5 +25177,5 @@ #. 50000 #. -#. +#. #. #. @@ -25185,5 +25185,5 @@ #. 50000 #. -#. +#. #. #. @@ -25193,5 +25193,5 @@ #. 50000 #. -#. +#. #. #. @@ -25201,5 +25201,5 @@ #. 50000 #. -#. +#. #. #. @@ -25209,5 +25209,5 @@ #. 50000 #. -#. +#. #. #. @@ -25217,5 +25217,5 @@ #. 50000 #. -#. +#. #. #. @@ -25225,5 +25225,5 @@ #. 50000 #. -#. +#. #. #. @@ -25233,5 +25233,5 @@ #. 50000 #. -#. +#. #. #. @@ -25241,5 +25241,5 @@ #. 50000 #. -#. +#. #. #. @@ -25249,5 +25249,5 @@ #. 50000 #. -#. +#. #. #. @@ -25257,5 +25257,5 @@ #. 50000 #. -#. +#. #. #. @@ -25265,5 +25265,5 @@ #. 50000 #. -#. +#. #. #. @@ -25273,5 +25273,5 @@ #. 50000 #. -#. +#. #. #. @@ -25281,5 +25281,5 @@ #. 50000 #. -#. +#. #. #. @@ -25289,5 +25289,5 @@ #. 50000 #. -#. +#. #. #. @@ -25297,5 +25297,5 @@ #. 50000 #. -#. +#. #. #. @@ -25305,5 +25305,5 @@ #. 50000 #. -#. +#. #. #. @@ -25313,5 +25313,5 @@ #. 50000 #. -#. +#. #. #. @@ -25321,5 +25321,5 @@ #. 50000 #. -#. +#. #. #. @@ -25328,5 +25328,5 @@ #. 50000 #. -#. +#. #. #. @@ -25358,5 +25358,5 @@ #. 50000 #. -#. +#. #. #. @@ -25366,5 +25366,5 @@ #. 50000 #. -#. +#. #. #. @@ -25374,7 +25374,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25389,5 +25389,5 @@ #. 50000 #. -#. +#. #. #. @@ -25397,5 +25397,5 @@ #. 50000 #. -#. +#. #. #. @@ -25405,5 +25405,5 @@ #. 50000 #. -#. +#. #. #. @@ -25413,5 +25413,5 @@ #. 50000 #. -#. +#. #. #. @@ -25421,5 +25421,5 @@ #. 50000 #. -#. +#. #. #. @@ -25429,5 +25429,5 @@ #. 50000 #. -#. +#. #. #. @@ -25437,5 +25437,5 @@ #. 50000 #. -#. +#. #. #. @@ -25451,7 +25451,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25461,5 +25461,5 @@ #. 50000 #. -#. +#. #. #. @@ -25469,5 +25469,5 @@ #. 50000 #. -#. +#. #. #. @@ -25477,5 +25477,5 @@ #. 50000 #. -#. +#. #. #. @@ -25485,5 +25485,5 @@ #. 50000 #. -#. +#. #. #. @@ -25493,5 +25493,5 @@ #. 50000 #. -#. +#. #. #. @@ -25501,5 +25501,5 @@ #. 50000 #. -#. +#. #. #. @@ -25509,5 +25509,5 @@ #. 50000 #. -#. +#. #. #. @@ -25517,5 +25517,5 @@ #. 50000 #. -#. +#. #. #. @@ -25525,5 +25525,5 @@ #. 50000 #. -#. +#. #. #. @@ -25533,5 +25533,5 @@ #. 50000 #. -#. +#. #. #. @@ -25541,5 +25541,5 @@ #. 50000 #. -#. +#. #. #. @@ -25549,5 +25549,5 @@ #. 50000 #. -#. +#. #. #. @@ -25557,5 +25557,5 @@ #. 50000 #. -#. +#. #. #. @@ -25565,5 +25565,5 @@ #. 50000 #. -#. +#. #. #. @@ -25573,5 +25573,5 @@ #. 50000 #. -#. +#. #. #. @@ -25581,5 +25581,5 @@ #. 50000 #. -#. +#. #. #. @@ -25589,5 +25589,5 @@ #. 50000 #. -#. +#. #. #. @@ -25597,5 +25597,5 @@ #. 50000 #. -#. +#. #. #. @@ -25605,5 +25605,5 @@ #. 50000 #. -#. +#. #. #. @@ -25613,5 +25613,5 @@ #. 50000 #. -#. +#. #. #. @@ -25621,5 +25621,5 @@ #. 50000 #. -#. +#. #. #. @@ -25629,5 +25629,5 @@ #. 50000 #. -#. +#. #. #. @@ -25637,5 +25637,5 @@ #. 50000 #. -#. +#. #. #. @@ -25645,5 +25645,5 @@ #. 50000 #. -#. +#. #. #. @@ -25653,5 +25653,5 @@ #. 50000 #. -#. +#. #. #. @@ -25661,5 +25661,5 @@ #. 50000 #. -#. +#. #. #. @@ -25669,5 +25669,5 @@ #. 50000 #. -#. +#. #. #. @@ -25677,5 +25677,5 @@ #. 50000 #. -#. +#. #. #. @@ -25685,5 +25685,5 @@ #. 50000 #. -#. +#. #. #. @@ -25693,5 +25693,5 @@ #. 50000 #. -#. +#. #. #. @@ -25701,5 +25701,5 @@ #. 50000 #. -#. +#. #. #. @@ -25709,5 +25709,5 @@ #. 50000 #. -#. +#. #. #. @@ -25717,5 +25717,5 @@ #. 50000 #. -#. +#. #. #. @@ -25725,5 +25725,5 @@ #. 50000 #. -#. +#. #. #. @@ -25733,5 +25733,5 @@ #. 50000 #. -#. +#. #. #. @@ -25741,5 +25741,5 @@ #. 50000 #. -#. +#. #. #. @@ -25749,5 +25749,5 @@ #. 50000 #. -#. +#. #. #. @@ -25757,5 +25757,5 @@ #. 50000 #. -#. +#. #. #. @@ -25765,5 +25765,5 @@ #. 50000 #. -#. +#. #. #. @@ -25773,5 +25773,5 @@ #. 50000 #. -#. +#. #. #. @@ -25781,5 +25781,5 @@ #. 50000 #. -#. +#. #. #. @@ -25789,5 +25789,5 @@ #. 50000 #. -#. +#. #. #. @@ -25823,7 +25823,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25833,5 +25833,5 @@ #. 50000 #. -#. +#. #. #. @@ -25841,5 +25841,5 @@ #. 50000 #. -#. +#. #. #. @@ -25849,5 +25849,5 @@ #. 50000 #. -#. +#. #. #. @@ -25857,5 +25857,5 @@ #. 50000 #. -#. +#. #. #. @@ -25865,5 +25865,5 @@ #. 50000 #. -#. +#. #. #. @@ -25873,5 +25873,5 @@ #. 50000 #. -#. +#. #. #. @@ -25881,5 +25881,5 @@ #. 50000 #. -#. +#. #. #. @@ -25896,5 +25896,5 @@ #. 50000 #. -#. +#. #. #. @@ -25904,5 +25904,5 @@ #. 50000 #. -#. +#. #. #. @@ -25912,5 +25912,5 @@ #. 50000 #. -#. +#. #. #. @@ -25920,5 +25920,5 @@ #. 50000 #. -#. +#. #. #. @@ -25928,5 +25928,5 @@ #. 50000 #. -#. +#. #. #. @@ -25936,5 +25936,5 @@ #. 50000 #. -#. +#. #. #. @@ -25945,5 +25945,5 @@ #. 50000 #. -#. +#. #. #. @@ -25953,5 +25953,5 @@ #. 50000 #. -#. +#. #. #. @@ -25961,5 +25961,5 @@ #. 40000 #. -#. +#. #. #. @@ -25969,5 +25969,5 @@ #. 50000 #. -#. +#. #. #. @@ -25976,5 +25976,5 @@ #. 40000 #. -#. +#. #. #. @@ -25983,5 +25983,5 @@ #. 40000 #. -#. +#. #. #. @@ -25999,7 +25999,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26009,5 +26009,5 @@ #. 50000 #. -#. +#. #. #. @@ -26017,5 +26017,5 @@ #. 50000 #. -#. +#. #. #. @@ -26025,5 +26025,5 @@ #. 50000 #. -#. +#. #. #. @@ -26033,5 +26033,5 @@ #. 50000 #. -#. +#. #. #. @@ -26041,5 +26041,5 @@ #. 50000 #. -#. +#. #. #. @@ -26049,5 +26049,5 @@ #. 50000 #. -#. +#. #. #. @@ -26057,5 +26057,5 @@ #. 50000 #. -#. +#. #. #. @@ -26065,5 +26065,5 @@ #. 50000 #. -#. +#. #. #. @@ -26073,5 +26073,5 @@ #. 50000 #. -#. +#. #. #. @@ -26090,5 +26090,5 @@ #. 50000 #. -#. +#. #. #. @@ -26102,5 +26102,5 @@ #. 50000 #. -#. +#. #. #. @@ -26114,5 +26114,5 @@ #. 50000 #. -#. +#. #. #. @@ -26122,5 +26122,5 @@ #. 50000 #. -#. +#. #. #. @@ -26134,5 +26134,5 @@ #. 50000 #. -#. +#. #. #. @@ -26146,5 +26146,5 @@ #. 50000 #. -#. +#. #. #. @@ -26158,6 +26158,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26167,5 +26167,5 @@ #. 50000 #. -#. +#. #. #. @@ -26179,5 +26179,5 @@ #. 50000 #. -#. +#. #. #. @@ -26191,5 +26191,5 @@ #. 50000 #. -#. +#. #. #. @@ -26203,5 +26203,5 @@ #. 50000 #. -#. +#. #. #. @@ -26215,5 +26215,5 @@ #. 50000 #. -#. +#. #. #. @@ -26227,5 +26227,5 @@ #. 50000 #. -#. +#. #. #. @@ -26235,7 +26235,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26245,5 +26245,5 @@ #. 50000 #. -#. +#. #. #. @@ -26253,5 +26253,5 @@ #. 50000 #. -#. +#. #. #. @@ -26261,5 +26261,5 @@ #. 50000 #. -#. +#. #. #. @@ -26269,5 +26269,5 @@ #. 50000 #. -#. +#. #. #. @@ -26284,5 +26284,5 @@ #. 50000 #. -#. +#. #. #. @@ -26295,5 +26295,5 @@ #. 50000 #. -#. +#. #. #. @@ -26307,5 +26307,5 @@ #. 50000 #. -#. +#. #. #. @@ -26319,5 +26319,5 @@ #. 50000 #. -#. +#. #. #. @@ -26331,5 +26331,5 @@ #. 50000 #. -#. +#. #. #. @@ -26340,5 +26340,5 @@ #. 50000 #. -#. +#. #. #. @@ -26348,5 +26348,5 @@ #. 50000 #. -#. +#. #. #. @@ -26356,5 +26356,5 @@ #. 50000 #. -#. +#. #. #. @@ -26364,5 +26364,5 @@ #. 50000 #. -#. +#. #. #. @@ -26372,5 +26372,5 @@ #. 50000 #. -#. +#. #. #. @@ -26387,5 +26387,5 @@ #. 50000 #. -#. +#. #. #. @@ -26399,5 +26399,5 @@ #. 50000 #. -#. +#. #. #. @@ -26411,5 +26411,5 @@ #. 50000 #. -#. +#. #. #. @@ -26423,5 +26423,5 @@ #. 50000 #. -#. +#. #. #. @@ -26435,5 +26435,5 @@ #. 50000 #. -#. +#. #. #. @@ -26447,5 +26447,5 @@ #. 50000 #. -#. +#. #. #. @@ -26454,7 +26454,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26464,5 +26464,5 @@ #. 50000 #. -#. +#. #. #. @@ -26472,5 +26472,5 @@ #. 50000 #. -#. +#. #. #. @@ -26480,5 +26480,5 @@ #. 50000 #. -#. +#. #. #. @@ -26488,5 +26488,5 @@ #. 50000 #. -#. +#. #. #. @@ -26496,5 +26496,5 @@ #. 50000 #. -#. +#. #. #. @@ -26504,5 +26504,5 @@ #. 50000 #. -#. +#. #. #. @@ -26512,5 +26512,5 @@ #. 50000 #. -#. +#. #. #. @@ -26527,7 +26527,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26537,5 +26537,5 @@ #. 50000 #. -#. +#. #. #. @@ -26545,5 +26545,5 @@ #. 50000 #. -#. +#. #. #. @@ -26553,5 +26553,5 @@ #. 50000 #. -#. +#. #. #. @@ -26561,5 +26561,5 @@ #. 50000 #. -#. +#. #. #. @@ -26575,5 +26575,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26622,5 +26622,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26630,5 +26630,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26638,5 +26638,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26646,5 +26646,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26654,5 +26654,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26662,5 +26662,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26670,5 +26670,5 @@ #. 50000 #. -#. +#. #. #. @@ -26678,5 +26678,5 @@ #. 50000 #. -#. +#. #. #. @@ -26686,5 +26686,5 @@ #. 50000 #. -#. +#. #. #. @@ -26694,5 +26694,5 @@ #. 50000 #. -#. +#. #. #. @@ -26702,5 +26702,5 @@ #. 50000 #. -#. +#. #. #. @@ -26710,5 +26710,5 @@ #. 50000 #. -#. +#. #. #. @@ -26728,5 +26728,5 @@ #. 50000 #. -#. +#. #. #. @@ -26735,5 +26735,5 @@ #. 50000 #. -#. +#. #. #. @@ -26742,5 +26742,5 @@ #. 50000 #. -#. +#. #. #. @@ -26749,5 +26749,5 @@ #. 40000 #. -#. +#. #. #. @@ -26756,5 +26756,5 @@ #. 40000 #. -#. +#. #. #. @@ -26763,5 +26763,5 @@ #. 40000 #. -#. +#. #. #. @@ -26856,5 +26856,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -26862,28 +26862,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 @@ -26998,5 +26998,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27009,5 +27009,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27032,6 +27032,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27040,6 +27040,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27054,6 +27054,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 @@ -27067,6 +27067,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 @@ -27086,6 +27086,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27109,6 +27109,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 @@ -27121,4 +27121,61 @@ 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 "No images with readable timestamps found." +#~ msgstr "לא נמצאו תמונות עם חותמות זמין קריאות." + +#~ msgid "GPS start: {0}" +#~ msgstr "התחלת GPS: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "סיום GPS: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "הפרש נוכחי: {0}ש'" + +#~ msgid "timezone difference: " +#~ msgstr "הפרש אזורי הזמן: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} מתוך הרצועה." + +#~ msgid "Sync clock" +#~ msgstr "סנכרן שעון" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "לא ניתן לנתח את התאריך שבקובץ \"{0}\"" + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"." + +#~ msgid "Image" +#~ msgstr "תמונה" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "אזור זמן של יחידת GPS (הבדל מתמונה)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "סנכרן את השעה עם יחידת ה-GPS" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "לא ניתן לנתח את הזמן שהוזן." + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "פותח תמונות ב-AgPifoJ..." + #~ msgid "Move" #~ msgstr "הזז" @@ -27130,7 +27187,4 @@ #~ msgstr "לא יובאו נתונים." -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "נא הזן את נקודות הציון הרצויות תחילה." - #~ msgid "Select a bookmark first." #~ msgstr "בחר סימניה תחילה." @@ -27160,5 +27214,4 @@ #~ msgstr "שינויים לא שמורים" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}" @@ -27173,5 +27226,4 @@ #~ msgstr "הגירסה הפתורה:" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27189,7 +27241,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" @@ -27208,11 +27261,10 @@ #~ msgstr "עזרה מקוונת עבור JOSM" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "שגיאה בעת טעינת העמוד {0}" #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" #~ "לצמתים האפשריים ישנן קשרי חברות שונים. האם אתה עדיין מעוניין למזג אותם?" @@ -27225,10 +27277,10 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" -#~ "שגיאה פנימית: לא ניתן לבדוק תנאים לשכבה שלא נבחרה. אנא דווח על זאת כעל תקלה." - -#, java-format +#~ "שגיאה פנימית: לא ניתן לבדוק תנאים לשכבה שלא נבחרה. אנא דווח על זאת כעל " +#~ "תקלה." + #~ msgid "Please report a ticket at {0}" #~ msgstr "אנא דווח על {0}" @@ -27243,6 +27295,6 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "נסה לעדכן לגירסא האחרונה של JOSM וכל התוספים לפני דיווח על תקלה." @@ -27268,5 +27320,4 @@ #~ msgstr "ההעברה הופסקה בגלל שגיאה (יחכה 5 שניות):" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "תוסף דורש את עדכון JOSM: {0}." @@ -27290,5 +27341,4 @@ #~ msgstr "תאריך" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "מחברים: {0}" @@ -27300,8 +27350,4 @@ #~ msgstr "שם משתמש OSM (אי-מייל)" -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "שגיאה במחיקת קובץ התוסף: {0}" - #~ msgid "Plugin already exists" #~ msgstr "התוסף כבר קיים" @@ -27355,5 +27401,4 @@ #~ msgstr "ניווט" -#, java-format #~ msgid "requested: {0}" #~ msgstr "התבקש: {0}" @@ -27383,5 +27428,4 @@ #~ msgstr "פתח את חלון OpenStreetBugs והפעל את ההורדה האוטומטית" -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -27394,5 +27438,4 @@ #~ "{0}" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "התנגשויות: {0}" @@ -27428,7 +27471,7 @@ #~ msgstr "בחר משתמש בעזרת פאנל המחברים" -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "כנראה שהתוסף {0} אינו תקין או שאי אפשר להוריד אותו בצורה אוטומטית." @@ -27437,8 +27480,7 @@ #~ "setting the config option 'pluginmanager.warntime'.)" #~ msgstr "" -#~ "(ניתן לשנות את מספר הימים שאחריהם האזהרה תופיע
ע\"י קביעת אפשרות התצורה " -#~ "'pluginmanager.warntime')." - -#, java-format +#~ "(ניתן לשנות את מספר הימים שאחריהם האזהרה תופיע
ע\"י קביעת אפשרות " +#~ "התצורה 'pluginmanager.warntime')." + #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "לא יכול להוריד תוסף: {0} מ{1}" @@ -27447,5 +27489,4 @@ #~ msgstr "EPSG:4326" -#, java-format #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "פתור {0} התנגשויות ב{1} עצמים" @@ -27475,5 +27516,4 @@ #~ msgstr "ניתן להשתמש בעכבר או ב- Ctrl+מקשי חיצים/./ למיקוד והזזה." -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "מדלג על דרך כי היא מכילה נקודה שאינה קיימת: {0}\n" @@ -27484,10 +27524,10 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" -#~ "הזערה: הסיסמא נשמרת בצורה לא מוצפנת בקובץ המאפיינים.
הסיסמא נשלחת " -#~ "בצורה לא מוצפנת לשרת, מקודדת בכתובת.
אל תשתמש בסיסמא בעלת " -#~ "ערך." +#~ "הזערה: הסיסמא נשמרת בצורה לא מוצפנת בקובץ המאפיינים.
הסיסמא " +#~ "נשלחת בצורה לא מוצפנת לשרת, מקודדת בכתובת.
אל תשתמש בסיסמא בעלת ערך." +#~ "" #~ msgid "Combine Anyway" @@ -27497,5 +27537,4 @@ #~ msgstr "מזג בכל זאת" -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -27539,5 +27578,4 @@ #~ msgstr "בחר דרכים עם זווית כמעט ישרה ליישור" -#, java-format #~ msgid "Checking whether node {0} is gone ..." #~ msgstr "בודק האם נקודה {0} נעלמה..." @@ -27591,5 +27629,4 @@ #~ msgstr "הורד" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "עורך יחסים: {0}" @@ -27598,5 +27635,4 @@ #~ msgstr "רמז: כמה מהשינויים נובעים מהעלאת נתונים חדשים לשרת." -#, java-format #~ msgid "Unexpected return value. Got {0}." #~ msgstr "ערך מוחזר לא צפוי. התקבל {0}" Index: /applications/editors/josm/i18n/po/is.po =================================================================== --- /applications/editors/josm/i18n/po/is.po (revision 18974) +++ /applications/editors/josm/i18n/po/is.po (revision 18975) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 16:20+0100\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" "PO-Revision-Date: 2009-11-24 12:07+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:06+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:18+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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" @@ -116,5 +115,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 @@ -137,9 +136,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 @@ -155,20 +154,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 @@ -187,7 +182,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 "Villa" @@ -267,5 +262,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 "Viðbætur" @@ -306,4 +301,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 @@ -311,8 +308,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 @@ -322,29 +319,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 "Breiddargráða" #: ../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 "Lengdargráða" @@ -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}" @@ -688,10 +683,10 @@ "að sameina þá þurfa þeir að vera ein samfelld röð af hnútum" -#: ../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 "Sameina {0} vegi" -#: ../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 "Vinsamlegast veldu a.m.k. tvo vegi til að sameina." @@ -710,19 +705,19 @@ msgstr "Veldu eithvað til að afrita" +#: ../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 "Búa til hring" -#: ../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 "Búa til hring úr þrem völdum hnútum." -#: ../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 " @@ -733,9 +728,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 @@ -807,21 +802,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" @@ -829,6 +828,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 @@ -857,5 +856,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 "Tvöfalda" @@ -912,8 +911,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 @@ -921,5 +918,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 @@ -932,8 +929,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 @@ -952,8 +949,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 @@ -976,13 +973,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 @@ -1022,4 +1020,100 @@ msgstr "Sýna upplýsingar um þennan hlut á OpenStreetMap vefnum" +#: ../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 "Leysa árekstra" + +#: ../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 @@ -1039,4 +1133,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" @@ -1047,26 +1182,26 @@ msgstr "Sameina það lag sem nú er valið öðru lagi" +#: ../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 "Sameina hnúta" -#: ../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 "Sameina valda hnúta á staðsetningu þess elsta." -#: ../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 "Veldu minnst tvo hnúta til að sameina." -#: ../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 "" @@ -1074,5 +1209,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" @@ -1435,6 +1570,5 @@ "Select all undeleted objects in the data layer. This selects incomplete " "objects too." -msgstr "" -"Velja alla hluti í núverandi lagi. Þetta velur einnig ókláraða hluti." +msgstr "Velja alla hluti í núverandi lagi. Þetta velur einnig ókláraða hluti." #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 @@ -1444,6 +1578,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 "" "Sýna stöðuskýrslu með nytsamlegum upplýsingum sem hægt er að hengja við " @@ -1465,9 +1598,42 @@ #: ../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 "Loka" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Einfalda veg" + +#: ../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 "Veldu í það minnsta einn veg til að einfalda." + +#: ../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] "Þú ert með {0} veg valinn. Ertu viss um að þú viljir einfalda hann?" +msgstr[1] "" +"Þú ert með {0} vegi valda. Ertu viss um að þú viljir einfalda þá alla?" + +#: ../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] "Einfalda veg (fjarlægja {0} hnút)" +msgstr[1] "Einfalda veg (fjarlægja {0} hnúta)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1598,6 +1764,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 "" @@ -1673,54 +1838,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 "Uppfæra val" +#: ../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 "" @@ -1729,35 +1894,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 "Engar breytingar til að hlaða upp" -#: ../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 "Ekkert til að upphala. Náðu í og breyttu einhverjum gögnum fyrst." -#: ../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 "" @@ -1765,28 +1930,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 "" @@ -1796,22 +1959,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 "" @@ -1822,15 +1985,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 "" @@ -1842,6 +2005,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 "" @@ -1850,38 +2013,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 "" @@ -2045,6 +2207,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 "" @@ -2111,38 +2273,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 "Get ekki bætt við hnút handan endamarka veraldar." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Bæta við hnút" -#: ../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 "Bæta hnút við veg" -#: ../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 "Bætti hnút við veg sem til var fyrir" -#: ../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 "Búa til nýjan hnút." -#: ../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." @@ -2151,14 +2313,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 "" @@ -2193,6 +2355,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 "" @@ -2287,5 +2449,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." @@ -2375,12 +2537,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - Hlutir sem breytt hefur verið af gefnum notanda" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - hlutur með þessa kennitölu (0 fyrir nýja hluti)" -#: ../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 "nodes:... - Hlutur með gefið marga hnúta (t.d. „5“ eða „7-9“)" -#: ../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-" @@ -2388,35 +2555,35 @@ 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 "modified - Hlutum sem breytt hefur verið" -#: ../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 "selected - Valdir hlutir" -#: ../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 "incomplete - Ókláraðir hlutir" -#: ../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 "untagged - Hlutir án eiginda" -#: ../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 "child segð - allir undirhlutir sem passa við segðina" -#: ../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 "parent segð - allir yfirhlutir sem passa við segðina" -#: ../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 "Notaðu | eða OR t.d. „A | B“ til að leita að A eða B" -#: ../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 "" @@ -2424,9 +2591,9 @@ "„:“ eða „ “" -#: ../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 "Notaðu ( og ) til að sameina segðir" -#: ../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 @@ -2436,55 +2603,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 "Leit" -#: ../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 "Hefja leit" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "stafsetursnæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "stafsetursónæmt" -#: ../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 "" @@ -2494,14 +2661,14 @@ 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" @@ -2510,26 +2677,26 @@ "hnút, veg og vensl" -#: ../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 "" @@ -2538,9 +2705,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 "" @@ -2549,5 +2716,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." @@ -2598,6 +2765,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 "" @@ -2605,5 +2771,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 "" @@ -2739,5 +2905,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 "" @@ -2756,5 +2922,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 "" @@ -2773,19 +2940,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" @@ -2794,5 +2961,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" @@ -2801,5 +2968,5 @@ msgstr[1] "Eyða {0} hnútum" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2808,5 +2975,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" @@ -2817,16 +2984,16 @@ #. 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 "" -"Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur " -"niðurhalað.
Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð " -"ekki) gætu verið að nota þá.
Ertu viss um að þú viljir eyða þeim?" - -#: ../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 "" +"Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur niðurhalað." +"
Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð ekki) gætu " +"verið að nota þá.
Ertu viss um að þú viljir eyða þeim?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "" @@ -2844,15 +3011,15 @@ msgstr[1] "Færði {0} hnúta" -#: ../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 "" @@ -2861,5 +3028,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}" @@ -2869,9 +3036,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 "" @@ -2951,5 +3113,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 " @@ -3092,6 +3254,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 "" @@ -3174,5 +3336,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3181,5 +3343,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3187,25 +3349,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 "S" #. 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 "N" #. 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 "V" #. 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 "A" #: ../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 @@ -3228,25 +3390,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}" @@ -3254,6 +3417,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 "" @@ -3316,24 +3479,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 " @@ -3341,5 +3504,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 "" @@ -3371,6 +3534,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}." @@ -3391,5 +3554,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 @@ -3401,6 +3563,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 "" @@ -3411,135 +3572,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 "" +#: ../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 "" + +#: ../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 "" + +#: ../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:557 +msgid "More than one \"to\" way found." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:922 -#, java-format -msgid "Deleted member ''{0}'' in relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:930 -#, java-format -msgid "Way ''{0}'' with less than two points." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -msgid "More than one \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 -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: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 "Óþekkt hlutverk \"{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 "" -#: ../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:832 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "" + +#: ../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:891 #, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:903 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950 -#, 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 "Villa: {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}" @@ -3551,5 +3712,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 @@ -3568,5 +3729,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 @@ -3586,5 +3747,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 "bakgrunnur" @@ -3702,6 +3863,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 "" @@ -3716,5 +3876,5 @@ msgstr "Ekki sýna þessi skilaboð aftur" -#: ../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 @@ -3722,32 +3882,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 "óklárað" -#: ../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 "vatnsfarvegur" -#: ../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" @@ -3756,5 +3916,5 @@ msgstr[1] "{0} hnútar" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -3995,12 +4155,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Skrá" -#: ../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 @@ -4014,19 +4174,19 @@ msgstr "Breyta" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Sýn" -#: ../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 "Tól" -#: ../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 "Forstillingar" -#: ../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 @@ -4037,5 +4197,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Hljóð" @@ -4079,29 +4239,29 @@ msgstr "skali" -#: ../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 "Lengdargráðan undir músabendlinum." -#: ../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 "Breiddargráðan undir músabendlinum." -#: ../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 " @@ -4109,9 +4269,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(enginn hlutur)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "" @@ -4217,5 +4377,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" @@ -4224,5 +4384,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" @@ -4231,5 +4391,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" @@ -4248,5 +4408,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 @@ -4263,5 +4423,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" @@ -4333,22 +4493,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." @@ -4427,6 +4587,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 "" @@ -4495,6 +4654,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" @@ -4502,6 +4661,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" @@ -4558,6 +4717,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 "" @@ -4590,7 +4749,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 "" @@ -4736,5 +4895,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 "" @@ -4869,5 +5028,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 "Vista" @@ -4967,7 +5126,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" @@ -4977,6 +5136,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" @@ -5010,7 +5169,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 "Hlutverk:" @@ -5099,5 +5256,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 @@ -5162,10 +5319,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 "" @@ -5240,18 +5396,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 "Breytingaskrá" -#: ../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 "Sýna breytingarsögu valdra hluta." -#: ../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 @@ -5261,13 +5417,13 @@ msgstr "Endurhlaða" -#: ../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 "Endurhlaða breytingaskrálistann með núverandi vali." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303 msgid "Show" msgstr "Sýna" -#: ../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 "" @@ -5460,5 +5616,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 "Afrita þessi vensl og opna breytingarglugga fyrir afritið" @@ -5501,25 +5657,25 @@ msgstr "Þysja að vali" -#: ../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 "Val: Hnútar:{2} / Vegir:{1} / Vensl:{0}" -#: ../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 "Val" -#: ../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 "Val: {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 "Opna þessa stiku sem glugga" -#: ../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." @@ -5528,5 +5684,5 @@ "vinstri tólastikunni." -#: ../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 "Smelltu til að minnka/hámarka innihald stikunnar" @@ -5586,37 +5742,37 @@ msgstr "Fjöldi hluta" -#: ../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 "Ná endurkvæmt í öll undirvensl" -#: ../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 "Hala niður öllum undirvenslum" -#: ../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 "" @@ -5627,66 +5783,94 @@ "ná í þau." -#: ../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/GenericRelationEditor.java:158 +#: ../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] "Hala niður öllum nóðum og vegum í þessum venslum" +msgstr[1] "Hala niður öllum nóðum og vegum í þessum venslum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Opna slóð" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "Sæki viðbótina {0}..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 msgid "Tags and Members" msgstr "Stök og tögg þeirra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Parent Relations" msgstr "Yfirvensl" -#: ../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 "Undirvensl" -#: ../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 "Vista hlutverk" + +#: ../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 "Bæta völdum stökum á vallistann" + +#: ../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 "" -"Í þessum venslum eru þegar eitt eða fleiri stök sem benda á " -"hlutinn
„{0}“.

Ertu viss um að þú viljir bæta við öðru staki sem " -"bendir á þennan hlut?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 +"primitive ''{0}''

Do you really want to add another relation member?" +msgstr "" +"Í þessum venslum eru þegar eitt eða fleiri stök sem benda á hlutinn
" +"„{0}“.

Ertu viss um að þú viljir bæta við öðru staki sem bendir á " +"þennan hlut?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 msgid "Multiple members referring to same primitive" msgstr "Mörg stök benda á sama hlutinn" -#: ../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 "" @@ -5696,15 +5880,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 " @@ -5712,5 +5896,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 " @@ -5718,20 +5902,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 "" @@ -5740,66 +5924,69 @@ 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 "Bæta völdum stökum á vallistann" -#: ../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 "Raða stöknum" -#. 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 +msgid "Sort" +msgstr "Raða" + +#: ../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 "Færa valda meðlimi upp" #. 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 "Færa valda meðlimi niður" #. 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 "Fjarlægja völd stök úr þessum venslum" #. 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 " @@ -5808,53 +5995,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 "Bæta við tómu taggi" -#: ../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 "Hala niður öllum nóðum og vegum í þessum venslum" -#: ../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 "Niðurhala meðlimum" -#: ../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 "Vistar hlutverk fyrir völd stök" -#: ../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 "Vista hlutverk" -#: ../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 "" @@ -5864,41 +6057,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 "Breyta venslunum sem valið stak bendir á" -#. 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 "" @@ -5938,19 +6124,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 "Vista breytingar" -#: ../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 "Búa til ný vensl í laginu „{0}“" -#: ../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 "Breyti nýjum venslum í laginu „{0}“" -#: ../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}''" @@ -5962,6 +6148,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 "" @@ -6141,7 +6326,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 "" @@ -6914,5 +7098,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 @@ -7149,6 +7333,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 "" @@ -7158,6 +7342,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 "" @@ -7420,13 +7604,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 "Opna vafra með upplýsingum um þetta breytingarsett" -#: ../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}" @@ -7527,6 +7711,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 "" @@ -7611,6 +7794,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] "" @@ -7624,6 +7807,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 " @@ -7678,5 +7861,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 " @@ -7684,5 +7867,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 "" @@ -7755,40 +7938,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 "Stillingar" -#: ../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 "Tögg fyrir nýtt breytingarsett" -#: ../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 "Hlutum sem verður bætt við:" -#: ../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 "Hlutum sem verður breytt:" -#: ../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 "Hlutum sem verður eytt:" -#: ../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:" @@ -7797,5 +7980,5 @@ msgstr[1] "{0} hlutum verður bætt við:" -#: ../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:" @@ -7804,5 +7987,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:" @@ -7811,66 +7994,62 @@ msgstr[1] "{0} hlutum verður eytt:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 msgid "Upload Changes" msgstr "Hlaða upp breytingum" -#: ../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 "Hlaða upp þessari breytingu" -#: ../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 "Sláðu inn hnitin fyrst" + +#: ../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 "Hætta við að hala upp og halda áfrám að breyta" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 -msgid "Upload all changes in one request" -msgstr "Upphala öllum breytingunum í einni fyrirspurn" - -#: ../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 "" -"Ef þetta er valið verða allar breytingarnar sendar í einni fyrirspurn. En ef " -"ekki verður gerð ein fyrirspurn fyrir hvern hlut sem breytt var" - -#: ../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 "Breytingarágrip (stutt lýsing á breytingunum sem þú gerðir)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../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 "Opna nýtt breytingarsett" -#: ../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 "" -"Opna nýtt breytingarsett, gögnum verður bætt í það þegar þú hleður upp" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 +msgstr "Opna nýtt breytingarsett, gögnum verður bætt í það þegar þú hleður upp" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726 msgid "Use an open changeset" msgstr "Nota opið breytingarsett" -#: ../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 "Bæta gögnunum við breytingarsett sem er þegar opið á þjóninum" -#: ../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 "Loka breytingarsettinu eftir að breytingunni hefur verið halið upp" -#: ../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 "" @@ -7878,6 +8057,6 @@ "breytingunum. Ekki verður hægt að bæta frekari gögnum við það." -#: ../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}" @@ -7885,16 +8064,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 "Niðurhala lista yfir opin breytingarsett frá þjóninum" -#: ../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 "Loka breytingarsettinu sem nú er valið" -#: ../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}." @@ -7902,6 +8081,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 "" @@ -7910,5 +8089,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 "" @@ -7919,6 +8098,6 @@ "be uploaded to the server." msgstr "" -"Veldu hluti úr vallistanum til að hlaða upp á " -"þjóninn." +"Veldu hluti úr vallistanum til að hlaða upp á þjóninn." +"" #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 @@ -7942,111 +8121,56 @@ msgstr "Halda áfrám ad hlaða upp" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 -#, java-format -msgid "Cannot read time \"{0}\" from point {1} x {2}" -msgstr "" - -#: ../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 "Les {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 "" - -#: ../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" +#: ../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 +#, fuzzy +msgid "Upload data in one request" +msgstr "Upphala öllum breytingunum í einni fyrirspurn" + +#: ../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 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" msgstr[0] "" msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Samstilla klukkur" - -#: ../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 "JPEG myndir (*.jpg)" - -#: ../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/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 "Sláðu inn leitarstreng" + +#: ../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 @@ -8054,30 +8178,30 @@ msgstr "" -#: ../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 "Sérsníða teikningu lína" -#: ../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 @@ -8085,5 +8209,5 @@ msgstr "Sérsníða liti" -#: ../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 @@ -8092,5 +8216,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 @@ -8099,58 +8223,63 @@ msgstr "Veldu lit" -#: ../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 "Flytja inn hljóð" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301 msgid "Import images" msgstr "Flytja inn myndir" -#: ../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 "JPEG myndir (*.jpg)" + +#: ../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 "" -#: ../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 @@ -8158,5 +8287,5 @@ msgstr "" -#: ../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" @@ -8166,5 +8295,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 @@ -8172,22 +8301,17 @@ msgstr "Lýsing" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 msgid "Timespan" msgstr "Tímaspan" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 msgid "Length" msgstr "Lengd" -#: ../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 "Lengd: " -#: ../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, " @@ -8196,5 +8320,5 @@ msgstr[1] "{0} leiðir, " -#: ../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" @@ -8203,22 +8327,22 @@ msgstr[1] "{0} punktar" -#: ../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 "Breyta í gagnalag" -#: ../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 "" -#: ../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 @@ -8228,29 +8352,29 @@ msgstr "" -#: ../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 "" -#: ../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} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8259,9 +8383,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 " @@ -8269,5 +8393,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 " @@ -8275,23 +8399,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 "Gagnalag {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 "útgáfa {0}" -#: ../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." @@ -8300,5 +8424,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 "" @@ -8312,5 +8436,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 "" @@ -8323,11 +8447,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" @@ -8336,32 +8460,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 "Tölfræði um {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 "API útgáfa: {0}" -#: ../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 "Breyta í GPX-lag" -#: ../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 "" @@ -8369,6 +8493,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 "" @@ -8407,4 +8531,343 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "GPX skrár (*.gpx *.gpx.gz)" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "" + +#: ../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 "Les {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] "" + +#: ../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 "Engin mynd" + +#: ../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 "Birtingarstillingar" + +#: ../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 "Fyrri" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Fjarlægja myndina úr laginu" + +#: ../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 "Næsta" + +#: ../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" @@ -8500,6 +8963,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Setting Preference entries directly. Use with caution!" -msgstr "" -"Hér er hægt að breyta öllum JOSM stillingum beint án annara milliliða." +msgstr "Hér er hægt að breyta öllum JOSM stillingum beint án annara milliliða." #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 @@ -8703,5 +9165,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 @@ -8897,6 +9359,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 "" @@ -8955,6 +9416,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 "" @@ -9022,18 +9482,18 @@ #: ../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 "Útlit og viðmót" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 -msgid "Default (Auto determined)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 msgid "Language" msgstr "Tungumál" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:112 +#: ../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 "" @@ -9294,6 +9754,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 "" @@ -9356,6 +9816,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 "" @@ -9368,9 +9828,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 "" @@ -9394,6 +9853,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 "" @@ -9486,5 +9945,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 "Frekari upplýsingar um þessa forstillingu" @@ -9571,5 +10030,5 @@ msgstr "Hala niður punktum {0} til {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 @@ -9577,5 +10036,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 +10152,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 +10186,31 @@ 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] "Hala niður punktum {0} til {1}..." +msgstr[1] "Hala niður punktum {0} til {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9787,27 +10252,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 +10280,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 msgid "Creating changeset..." msgstr "Bý til breytingarsett..." -#: ../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 "Opnaði breytingarsett {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 msgid "Updating changeset..." msgstr "Uppfæri breytingarsett.." -#: ../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 "Uppfæri breytingarsett {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 msgid "Closing changeset..." msgstr "Loka breytingasetti..." -#: ../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 "Undirbý..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Hleð upp gögnum..." -#: ../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 +10374,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 +10399,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 +10405,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 +10416,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}''." @@ -10008,7 +10473,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 "" @@ -10036,6 +10501,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 "" @@ -10101,46 +10566,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 "" @@ -10148,19 +10612,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 "Ógildur hlutur með kenni=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 "" @@ -10170,8 +10634,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 "" @@ -10181,25 +10645,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 "" @@ -10207,5 +10671,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10214,5 +10678,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10220,5 +10684,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10227,13 +10691,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 "Undirbý OSM gögn..." -#: ../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 "Undirbý gögn..." @@ -10286,4 +10750,10 @@ msgid "Contacting Server..." msgstr "Hef samband við þjóninn..." + +#: ../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 @@ -10322,43 +10792,44 @@ 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 "{0}% ({1}/{2}), {3} eftir. Hleð upp hnút ''{4}'' (id: {5})" -#: ../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 "{0}% ({1}/{2}), {3} eftir. Hleð upp veg ''{4}'' (id: {5})" -#: ../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 "{0}% ({1}/{2}), {3} eftir. Hleð upp venslum ''{4}'' (id: {5})" -#: ../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 "Hleð upp gögnum ..." - -#: ../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 "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10399,17 +10870,27 @@ msgstr "Sæki viðbótina {0}..." -#: ../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 "Sæki viðbótina {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}." @@ -10421,19 +10902,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" @@ -10442,51 +10922,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 "Síðasta uppfærsa viðbóta var framkvæmd fyrir meira en {0} dögum." -#: ../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 "Viðbótin „{0}“ fannst ekki." -#: ../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 "" -"Gat ekki hlaðið viðbótina „{0}“. Eyða henni úr listanum yfir viðbætur?" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220 +msgstr "Gat ekki hlaðið viðbótina „{0}“. Eyða henni úr listanum yfir viðbætur?" + #: ../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 "Gera viðbótina óvirka" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Keep plugin" msgstr "Halda viðbótinni" -#: ../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 " @@ -10496,9 +10975,9 @@ "yfirskrifa núverandi viðbætur." -#: ../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 "" @@ -10506,19 +10985,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 " @@ -10526,13 +11005,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" @@ -10651,6 +11130,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 "" @@ -10688,6 +11167,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 "" @@ -10749,7 +11228,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 "" @@ -10761,7 +11239,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 "" @@ -10793,6 +11271,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 "" @@ -11050,5 +11528,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" @@ -11063,12 +11541,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 @@ -11076,440 +11552,141 @@ 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 "Tilvísun" + +#. 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 +msgid "Actual" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "Fylki" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Leiga" + +#: ../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 +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 "Fyrri" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Fjarlægja myndina úr laginu" - -#: ../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 "Næsta" - -#: ../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 "Opna myndir með AgPifoJ..." - -#: ../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 "GPX skrár (*.gpx *.gpx.gz)" - -#: ../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 "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "" - -#: ../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 "Engin mynd" - -#: ../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 "" @@ -11654,11 +11831,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 "" @@ -11964,12 +12140,4 @@ msgid "Export as PNG format (only raster images)" 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] "Einfalda veg (fjarlægja {0} hnút)" -msgstr[1] "Einfalda veg (fjarlægja {0} hnúta)" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 @@ -12082,14 +12250,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 " @@ -12397,4 +12565,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" @@ -12438,18 +12610,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" @@ -12498,7 +12670,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12508,5 +12680,5 @@ #. 50000 #. -#. +#. #. #. @@ -12516,5 +12688,5 @@ #. 50000 #. -#. +#. #. #. @@ -12523,5 +12695,5 @@ #. 50000 #. -#. +#. #. #. @@ -12531,5 +12703,5 @@ #. 50000 #. -#. +#. #. #. @@ -12607,6 +12779,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 "" @@ -12625,7 +12796,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 "" @@ -12687,20 +12857,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 "" @@ -12917,6 +13086,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 "" @@ -12997,9 +13165,10 @@ msgstr "Óþekkt skráarending: {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 " @@ -13007,9 +13176,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 "" @@ -13382,17 +13547,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 "" @@ -13435,162 +13600,4 @@ #: ../plugins/terracer/src/terracer/TerracerAction.java:475 msgid "Optional" -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 "Leysa árekstra" - -#: ../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 "Einfalda veg" - -#: ../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 "Veldu í það minnsta einn veg til að einfalda." - -#: ../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] "" -"Þú ert með {0} veg valinn. Ertu viss um að þú viljir einfalda hann?" -msgstr[1] "" -"Þú ert með {0} vegi valda. Ertu viss um að þú viljir einfalda þá alla?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" msgstr "" @@ -13687,5 +13694,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}" @@ -13738,34 +13745,34 @@ msgstr "Hunsa viðkomandi villu við næstu staðreyningu" +#: ../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 "" @@ -13814,18 +13821,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 "" @@ -14054,7 +14061,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 "" @@ -14197,5 +14203,5 @@ #. 50000 #. -#. +#. #. #. @@ -14203,5 +14209,5 @@ #. #. -#. +#. #. #. @@ -14211,5 +14217,5 @@ #. 50000 #. -#. +#. #. #. @@ -14218,5 +14224,5 @@ #. 50000 #. -#. +#. #. #. @@ -14225,5 +14231,5 @@ #. 50000 #. -#. +#. #. #. @@ -14232,5 +14238,5 @@ #. 50000 #. -#. +#. #. #. @@ -14239,5 +14245,5 @@ #. 50000 #. -#. +#. #. #. @@ -14246,9 +14252,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14293,5 +14299,5 @@ #. 50000 #. -#. +#. #. #. @@ -14424,14 +14430,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 " @@ -14440,14 +14446,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 "" @@ -14456,5 +14462,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 "" @@ -14466,13 +14472,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." @@ -14626,50 +14632,50 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "Niðurhala sýnilega reiti" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "Breyta upplausn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Reload erroneous tiles" msgstr "Hlaða reiti sem innihalda villur" -#: ../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 "Vista WMS lag í skrá" -#: ../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 "Hlaða WMS lag úr skrá" -#: ../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 "" @@ -14745,5 +14751,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 "" @@ -14781,21 +14787,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 " @@ -14807,21 +14808,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 " @@ -14830,10 +14831,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 " @@ -14842,21 +14843,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 " @@ -14866,16 +14866,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 " @@ -14885,10 +14885,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 " @@ -14897,5 +14897,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 " @@ -14905,27 +14905,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 " @@ -14934,15 +14934,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 +msgid "Let other applications send commands to JOSM." +msgstr "" + +#. Plugin routes #: build/trans_plugins.java:55 -msgid "Let other applications send commands to JOSM." -msgstr "" - -#. Plugin routes -#: build/trans_plugins.java:57 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -14951,10 +14951,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 " @@ -14963,15 +14963,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 " @@ -14981,17 +14981,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 " @@ -15000,5 +14993,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15007,10 +15000,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, ...)." @@ -16063,8 +16056,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16261,5 +16254,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16269,5 +16262,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16286,5 +16279,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16294,5 +16287,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16311,5 +16304,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16319,5 +16312,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16336,5 +16329,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16344,5 +16337,5 @@ #. 300000 #. -#. +#. #. #. @@ -16357,5 +16350,5 @@ #. 300000 #. -#. +#. #. #. @@ -16373,5 +16366,5 @@ #. 50000 #. -#. +#. #. #. @@ -16389,5 +16382,5 @@ #. 40000 #. -#. +#. #. #. @@ -16396,5 +16389,5 @@ #. 40000 #. -#. +#. #. #. @@ -16404,5 +16397,5 @@ #. 50000 #. -#. +#. #. #. @@ -16422,5 +16415,5 @@ #. 50000 #. -#. +#. #. #. @@ -16429,5 +16422,5 @@ #. 50000 #. -#. +#. #. #. @@ -16437,5 +16430,5 @@ #. 50000 #. -#. +#. #. #. @@ -16485,7 +16478,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17184,5 +17177,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17221,5 +17214,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17315,5 +17308,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17470,5 +17463,5 @@ #. 50000 #. -#. +#. #. #. @@ -18855,5 +18848,5 @@ #. 30000 #. -#. +#. #. #. @@ -18863,5 +18856,5 @@ #. 40000 #. -#. +#. #. #. @@ -18871,5 +18864,5 @@ #. 20000 #. -#. +#. #. #. @@ -18879,5 +18872,5 @@ #. 40000 #. -#. +#. #. #. @@ -19235,7 +19228,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19245,5 +19238,5 @@ #. 50000 #. -#. +#. #. #. @@ -19253,5 +19246,5 @@ #. 50000 #. -#. +#. #. #. @@ -19261,5 +19254,5 @@ #. 50000 #. -#. +#. #. #. @@ -19269,5 +19262,5 @@ #. 50000 #. -#. +#. #. #. @@ -19277,5 +19270,5 @@ #. 50000 #. -#. +#. #. #. @@ -19285,5 +19278,5 @@ #. 50000 #. -#. +#. #. #. @@ -19293,5 +19286,5 @@ #. 50000 #. -#. +#. #. #. @@ -19301,5 +19294,5 @@ #. 50000 #. -#. +#. #. #. @@ -19309,5 +19302,5 @@ #. 50000 #. -#. +#. #. #. @@ -19317,5 +19310,5 @@ #. 50000 #. -#. +#. #. #. @@ -19325,5 +19318,5 @@ #. 50000 #. -#. +#. #. #. @@ -19333,5 +19326,5 @@ #. 50000 #. -#. +#. #. #. @@ -19341,5 +19334,5 @@ #. 50000 #. -#. +#. #. #. @@ -19349,5 +19342,5 @@ #. 50000 #. -#. +#. #. #. @@ -19357,5 +19350,5 @@ #. 50000 #. -#. +#. #. #. @@ -19365,5 +19358,5 @@ #. 50000 #. -#. +#. #. #. @@ -19373,5 +19366,5 @@ #. 50000 #. -#. +#. #. #. @@ -19381,5 +19374,5 @@ #. 50000 #. -#. +#. #. #. @@ -19389,5 +19382,5 @@ #. 50000 #. -#. +#. #. #. @@ -19397,5 +19390,5 @@ #. 50000 #. -#. +#. #. #. @@ -19405,5 +19398,5 @@ #. 50000 #. -#. +#. #. #. @@ -19413,5 +19406,5 @@ #. 50000 #. -#. +#. #. #. @@ -19421,5 +19414,5 @@ #. 50000 #. -#. +#. #. #. @@ -19429,5 +19422,5 @@ #. 50000 #. -#. +#. #. #. @@ -19437,5 +19430,5 @@ #. 50000 #. -#. +#. #. #. @@ -19445,5 +19438,5 @@ #. 50000 #. -#. +#. #. #. @@ -19453,5 +19446,5 @@ #. 50000 #. -#. +#. #. #. @@ -19461,5 +19454,5 @@ #. 50000 #. -#. +#. #. #. @@ -19469,5 +19462,5 @@ #. 50000 #. -#. +#. #. #. @@ -19477,5 +19470,5 @@ #. 50000 #. -#. +#. #. #. @@ -19485,5 +19478,5 @@ #. 50000 #. -#. +#. #. #. @@ -19493,5 +19486,5 @@ #. 50000 #. -#. +#. #. #. @@ -19501,5 +19494,5 @@ #. 50000 #. -#. +#. #. #. @@ -19509,5 +19502,5 @@ #. 50000 #. -#. +#. #. #. @@ -19517,5 +19510,5 @@ #. 50000 #. -#. +#. #. #. @@ -19525,5 +19518,5 @@ #. 50000 #. -#. +#. #. #. @@ -19533,5 +19526,5 @@ #. 50000 #. -#. +#. #. #. @@ -19541,5 +19534,5 @@ #. 50000 #. -#. +#. #. #. @@ -19549,5 +19542,5 @@ #. 50000 #. -#. +#. #. #. @@ -19557,5 +19550,5 @@ #. 50000 #. -#. +#. #. #. @@ -19565,5 +19558,5 @@ #. 50000 #. -#. +#. #. #. @@ -19573,5 +19566,5 @@ #. 50000 #. -#. +#. #. #. @@ -19581,5 +19574,5 @@ #. 50000 #. -#. +#. #. #. @@ -19589,5 +19582,5 @@ #. 50000 #. -#. +#. #. #. @@ -19597,5 +19590,5 @@ #. 50000 #. -#. +#. #. #. @@ -19605,5 +19598,5 @@ #. 50000 #. -#. +#. #. #. @@ -21297,7 +21290,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21307,5 +21300,5 @@ #. 50000 #. -#. +#. #. #. @@ -21315,5 +21308,5 @@ #. 50000 #. -#. +#. #. #. @@ -21323,5 +21316,5 @@ #. 50000 #. -#. +#. #. #. @@ -21331,5 +21324,5 @@ #. 50000 #. -#. +#. #. #. @@ -21339,5 +21332,5 @@ #. 50000 #. -#. +#. #. #. @@ -21347,5 +21340,5 @@ #. 50000 #. -#. +#. #. #. @@ -21355,5 +21348,5 @@ #. 50000 #. -#. +#. #. #. @@ -22684,5 +22677,5 @@ #. 40000 #. -#. +#. #. #. @@ -22698,5 +22691,5 @@ #. 30000 #. -#. +#. #. #. @@ -22707,7 +22700,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22717,5 +22710,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22725,13 +22726,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22741,5 +22734,5 @@ #. 50000 #. -#. +#. #. #. @@ -22772,5 +22765,5 @@ #. 50000 #. -#. +#. #. #. @@ -22786,5 +22779,5 @@ #. 50000 #. -#. +#. #. #. @@ -22794,5 +22787,5 @@ #. 10000 #. -#. +#. #. #. @@ -22802,5 +22795,5 @@ #. 10000 #. -#. +#. #. #. @@ -22811,5 +22804,5 @@ #. 10000 #. -#. +#. #. #. @@ -22838,5 +22831,5 @@ #. 50000 #. -#. +#. #. #. @@ -22951,9 +22944,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 @@ -22961,5 +22954,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, @@ -22969,8 +22962,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 @@ -22984,5 +22977,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -22990,5 +22983,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23037,6 +23030,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23116,5 +23109,5 @@ #. 40000 #. -#. +#. #. #. @@ -23124,5 +23117,5 @@ #. 10000 #. -#. +#. #. #. @@ -23131,5 +23124,5 @@ #. 50000 #. -#. +#. #. #. @@ -23139,5 +23132,5 @@ #. 50000 #. -#. +#. #. #. @@ -23146,5 +23139,5 @@ #. 50000 #. -#. +#. #. #. @@ -23153,5 +23146,5 @@ #. 50000 #. -#. +#. #. #. @@ -23160,5 +23153,5 @@ #. 50000 #. -#. +#. #. #. @@ -23167,5 +23160,5 @@ #. 50000 #. -#. +#. #. #. @@ -23174,5 +23167,5 @@ #. 40000 #. -#. +#. #. #. @@ -23181,5 +23174,5 @@ #. 50000 #. -#. +#. #. #. @@ -23188,5 +23181,5 @@ #. 50000 #. -#. +#. #. #. @@ -23195,5 +23188,5 @@ #. 50000 #. -#. +#. #. #. @@ -23202,5 +23195,5 @@ #. 50000 #. -#. +#. #. #. @@ -23209,5 +23202,5 @@ #. 50000 #. -#. +#. #. #. @@ -23216,5 +23209,5 @@ #. 50000 #. -#. +#. #. #. @@ -23224,5 +23217,5 @@ #. 50000 #. -#. +#. #. #. @@ -23231,5 +23224,5 @@ #. 50000 #. -#. +#. #. #. @@ -23240,5 +23233,5 @@ #. 50000 #. -#. +#. #. #. @@ -23250,11 +23243,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23263,7 +23256,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23274,5 +23267,5 @@ #. 50000 #. -#. +#. #. #. @@ -23283,5 +23276,5 @@ #. 50000 #. -#. +#. #. #. @@ -23292,5 +23285,5 @@ #. 50000 #. -#. +#. #. #. @@ -23301,5 +23294,5 @@ #. 50000 #. -#. +#. #. #. @@ -23310,5 +23303,5 @@ #. 50000 #. -#. +#. #. #. @@ -23319,5 +23312,5 @@ #. 40000 #. -#. +#. #. #. @@ -23329,5 +23322,5 @@ #. 50000 #. -#. +#. #. #. @@ -23338,5 +23331,5 @@ #. 50000 #. -#. +#. #. #. @@ -23361,5 +23354,5 @@ #. 10000 #. -#. +#. #. #. @@ -23368,5 +23361,5 @@ #. 50000 #. -#. +#. #. #. @@ -23375,5 +23368,5 @@ #. 50000 #. -#. +#. #. #. @@ -23389,5 +23382,5 @@ #. 20000 #. -#. +#. #. #. @@ -23401,5 +23394,5 @@ #. 30000 #. -#. +#. #. #. @@ -23408,5 +23401,5 @@ #. 50000 #. -#. +#. #. #. @@ -23415,5 +23408,5 @@ #. 50000 #. -#. +#. #. #. @@ -23422,5 +23415,5 @@ #. 50000 #. -#. +#. #. #. @@ -23429,5 +23422,5 @@ #. 50000 #. -#. +#. #. #. @@ -23436,5 +23429,5 @@ #. 50000 #. -#. +#. #. #. @@ -23443,5 +23436,5 @@ #. 50000 #. -#. +#. #. #. @@ -23450,5 +23443,5 @@ #. 50000 #. -#. +#. #. #. @@ -23457,5 +23450,5 @@ #. 50000 #. -#. +#. #. #. @@ -23464,5 +23457,5 @@ #. 50000 #. -#. +#. #. #. @@ -23471,5 +23464,5 @@ #. 50000 #. -#. +#. #. #. @@ -23478,5 +23471,5 @@ #. 50000 #. -#. +#. #. #. @@ -23485,5 +23478,5 @@ #. 50000 #. -#. +#. #. #. @@ -23492,5 +23485,5 @@ #. 50000 #. -#. +#. #. #. @@ -23499,5 +23492,5 @@ #. 50000 #. -#. +#. #. #. @@ -23668,7 +23661,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23682,5 +23675,5 @@ #. 40000 #. -#. +#. #. #. @@ -23690,7 +23683,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23700,5 +23693,5 @@ #. 50000 #. -#. +#. #. #. @@ -23708,5 +23701,5 @@ #. 50000 #. -#. +#. #. #. @@ -23716,5 +23709,5 @@ #. 50000 #. -#. +#. #. #. @@ -23724,5 +23717,5 @@ #. 50000 #. -#. +#. #. #. @@ -23738,5 +23731,5 @@ #. 10000 #. -#. +#. #. #. @@ -23746,5 +23739,5 @@ #. 50000 #. -#. +#. #. #. @@ -23754,5 +23747,5 @@ #. 50000 #. -#. +#. #. #. @@ -23762,5 +23755,5 @@ #. 50000 #. -#. +#. #. #. @@ -23770,5 +23763,5 @@ #. 50000 #. -#. +#. #. #. @@ -23778,5 +23771,5 @@ #. 50000 #. -#. +#. #. #. @@ -23786,5 +23779,5 @@ #. 50000 #. -#. +#. #. #. @@ -23803,5 +23796,5 @@ #. 50000 #. -#. +#. #. #. @@ -23810,5 +23803,5 @@ #. 50000 #. -#. +#. #. #. @@ -23822,5 +23815,5 @@ #. 50000 #. -#. +#. #. #. @@ -23834,5 +23827,5 @@ #. 50000 #. -#. +#. #. #. @@ -23841,5 +23834,5 @@ #. 50000 #. -#. +#. #. #. @@ -23853,5 +23846,5 @@ #. 50000 #. -#. +#. #. #. @@ -23866,5 +23859,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23879,5 +23872,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23891,5 +23884,5 @@ #. 50000 #. -#. +#. #. #. @@ -23903,5 +23896,5 @@ #. 50000 #. -#. +#. #. #. @@ -23910,5 +23903,5 @@ #. 50000 #. -#. +#. #. #. @@ -23917,5 +23910,5 @@ #. 50000 #. -#. +#. #. #. @@ -23929,5 +23922,5 @@ #. 50000 #. -#. +#. #. #. @@ -23937,5 +23930,5 @@ #. 50000 #. -#. +#. #. #. @@ -23944,5 +23937,5 @@ #. 50000 #. -#. +#. #. #. @@ -23951,5 +23944,5 @@ #. 50000 #. -#. +#. #. #. @@ -23958,5 +23951,5 @@ #. 50000 #. -#. +#. #. #. @@ -23966,5 +23959,5 @@ #. 50000 #. -#. +#. #. #. @@ -23975,5 +23968,5 @@ #. 50000 #. -#. +#. #. #. @@ -23983,7 +23976,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23993,5 +23986,5 @@ #. 50000 #. -#. +#. #. #. @@ -24001,5 +23994,5 @@ #. 50000 #. -#. +#. #. #. @@ -24009,5 +24002,5 @@ #. 50000 #. -#. +#. #. #. @@ -24018,5 +24011,5 @@ #. 50000 #. -#. +#. #. #. @@ -24026,5 +24019,5 @@ #. 50000 #. -#. +#. #. #. @@ -24034,5 +24027,5 @@ #. 50000 #. -#. +#. #. #. @@ -24042,5 +24035,5 @@ #. 50000 #. -#. +#. #. #. @@ -24050,5 +24043,5 @@ #. 50000 #. -#. +#. #. #. @@ -24058,5 +24051,5 @@ #. 50000 #. -#. +#. #. #. @@ -24066,5 +24059,5 @@ #. 50000 #. -#. +#. #. #. @@ -24074,5 +24067,5 @@ #. 50000 #. -#. +#. #. #. @@ -24082,5 +24075,5 @@ #. 50000 #. -#. +#. #. #. @@ -24103,7 +24096,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24113,5 +24106,5 @@ #. 50000 #. -#. +#. #. #. @@ -24120,5 +24113,5 @@ #. 50000 #. -#. +#. #. #. @@ -24128,5 +24121,5 @@ #. 50000 #. -#. +#. #. #. @@ -24135,5 +24128,5 @@ #. 50000 #. -#. +#. #. #. @@ -24143,5 +24136,5 @@ #. 50000 #. -#. +#. #. #. @@ -24151,5 +24144,5 @@ #. 50000 #. -#. +#. #. #. @@ -24165,5 +24158,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24174,5 +24167,5 @@ #. 50000 #. -#. +#. #. #. @@ -24191,5 +24184,5 @@ #. 50000 #. -#. +#. #. #. @@ -24199,5 +24192,5 @@ #. 50000 #. -#. +#. #. #. @@ -24210,5 +24203,5 @@ #. 50000 #. -#. +#. #. #. @@ -24226,5 +24219,5 @@ #. 50000 #. -#. +#. #. #. @@ -24233,5 +24226,5 @@ #. 50000 #. -#. +#. #. #. @@ -24240,5 +24233,5 @@ #. 50000 #. -#. +#. #. #. @@ -24247,7 +24240,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24258,5 +24251,5 @@ #. 50000 #. -#. +#. #. #. @@ -24271,5 +24264,5 @@ #. 50000 #. -#. +#. #. #. @@ -24283,5 +24276,5 @@ #. 50000 #. -#. +#. #. #. @@ -24291,5 +24284,5 @@ #. 50000 #. -#. +#. #. #. @@ -24303,5 +24296,5 @@ #. 50000 #. -#. +#. #. #. @@ -24315,5 +24308,5 @@ #. 50000 #. -#. +#. #. #. @@ -24322,7 +24315,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24332,5 +24325,5 @@ #. 50000 #. -#. +#. #. #. @@ -24340,5 +24333,5 @@ #. 50000 #. -#. +#. #. #. @@ -24348,5 +24341,5 @@ #. 50000 #. -#. +#. #. #. @@ -24356,5 +24349,5 @@ #. 50000 #. -#. +#. #. #. @@ -24370,7 +24363,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24385,5 +24378,5 @@ #. 30000 #. -#. +#. #. #. @@ -24398,5 +24391,5 @@ #. 30000 #. -#. +#. #. #. @@ -24411,5 +24404,5 @@ #. 30000 #. -#. +#. #. #. @@ -24424,5 +24417,5 @@ #. 30000 #. -#. +#. #. #. @@ -24437,5 +24430,5 @@ #. 30000 #. -#. +#. #. #. @@ -24450,7 +24443,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24460,5 +24453,5 @@ #. 50000 #. -#. +#. #. #. @@ -24467,5 +24460,5 @@ #. 50000 #. -#. +#. #. #. @@ -24475,5 +24468,5 @@ #. 50000 #. -#. +#. #. #. @@ -24483,5 +24476,5 @@ #. 50000 #. -#. +#. #. #. @@ -24491,5 +24484,5 @@ #. 50000 #. -#. +#. #. #. @@ -24499,5 +24492,5 @@ #. 50000 #. -#. +#. #. #. @@ -24507,5 +24500,5 @@ #. 50000 #. -#. +#. #. #. @@ -24515,5 +24508,5 @@ #. 50000 #. -#. +#. #. #. @@ -24523,5 +24516,5 @@ #. 50000 #. -#. +#. #. #. @@ -24531,5 +24524,5 @@ #. 50000 #. -#. +#. #. #. @@ -24539,5 +24532,5 @@ #. 50000 #. -#. +#. #. #. @@ -24547,5 +24540,5 @@ #. 50000 #. -#. +#. #. #. @@ -24555,5 +24548,5 @@ #. 50000 #. -#. +#. #. #. @@ -24573,5 +24566,5 @@ #. 50000 #. -#. +#. #. #. @@ -24586,5 +24579,5 @@ #. 50000 #. -#. +#. #. #. @@ -24597,7 +24590,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24607,5 +24600,5 @@ #. 50000 #. -#. +#. #. #. @@ -24615,5 +24608,5 @@ #. 50000 #. -#. +#. #. #. @@ -24623,5 +24616,5 @@ #. 50000 #. -#. +#. #. #. @@ -24631,5 +24624,5 @@ #. 50000 #. -#. +#. #. #. @@ -24639,5 +24632,5 @@ #. 50000 #. -#. +#. #. #. @@ -24647,5 +24640,5 @@ #. 50000 #. -#. +#. #. #. @@ -24655,5 +24648,5 @@ #. 50000 #. -#. +#. #. #. @@ -24663,5 +24656,5 @@ #. 50000 #. -#. +#. #. #. @@ -24671,5 +24664,5 @@ #. 50000 #. -#. +#. #. #. @@ -24679,5 +24672,5 @@ #. 50000 #. -#. +#. #. #. @@ -24687,5 +24680,5 @@ #. 50000 #. -#. +#. #. #. @@ -24695,5 +24688,5 @@ #. 50000 #. -#. +#. #. #. @@ -24703,5 +24696,5 @@ #. 50000 #. -#. +#. #. #. @@ -24711,5 +24704,5 @@ #. 50000 #. -#. +#. #. #. @@ -24730,5 +24723,5 @@ #. 50000 #. -#. +#. #. #. @@ -24742,7 +24735,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24752,5 +24745,5 @@ #. 50000 #. -#. +#. #. #. @@ -24760,5 +24753,5 @@ #. 50000 #. -#. +#. #. #. @@ -24768,5 +24761,5 @@ #. 50000 #. -#. +#. #. #. @@ -24776,5 +24769,5 @@ #. 50000 #. -#. +#. #. #. @@ -24784,5 +24777,5 @@ #. 50000 #. -#. +#. #. #. @@ -24792,5 +24785,5 @@ #. 50000 #. -#. +#. #. #. @@ -24800,5 +24793,5 @@ #. 50000 #. -#. +#. #. #. @@ -24815,5 +24808,5 @@ #. 50000 #. -#. +#. #. #. @@ -24823,5 +24816,5 @@ #. 50000 #. -#. +#. #. #. @@ -24831,5 +24824,5 @@ #. 50000 #. -#. +#. #. #. @@ -24839,5 +24832,5 @@ #. 50000 #. -#. +#. #. #. @@ -24847,5 +24840,5 @@ #. 50000 #. -#. +#. #. #. @@ -24855,5 +24848,5 @@ #. 50000 #. -#. +#. #. #. @@ -24863,5 +24856,5 @@ #. 50000 #. -#. +#. #. #. @@ -24871,5 +24864,5 @@ #. 50000 #. -#. +#. #. #. @@ -24879,5 +24872,5 @@ #. 50000 #. -#. +#. #. #. @@ -24887,5 +24880,5 @@ #. 50000 #. -#. +#. #. #. @@ -24895,5 +24888,5 @@ #. 50000 #. -#. +#. #. #. @@ -24903,5 +24896,5 @@ #. 50000 #. -#. +#. #. #. @@ -24920,5 +24913,5 @@ #. 50000 #. -#. +#. #. #. @@ -24928,5 +24921,5 @@ #. 50000 #. -#. +#. #. #. @@ -24935,5 +24928,5 @@ #. 50000 #. -#. +#. #. #. @@ -24943,5 +24936,5 @@ #. 50000 #. -#. +#. #. #. @@ -24951,5 +24944,5 @@ #. 50000 #. -#. +#. #. #. @@ -24959,5 +24952,5 @@ #. 50000 #. -#. +#. #. #. @@ -24966,5 +24959,5 @@ #. 50000 #. -#. +#. #. #. @@ -24974,5 +24967,5 @@ #. 50000 #. -#. +#. #. #. @@ -24982,5 +24975,5 @@ #. 50000 #. -#. +#. #. #. @@ -24990,5 +24983,5 @@ #. 50000 #. -#. +#. #. #. @@ -24998,5 +24991,5 @@ #. 50000 #. -#. +#. #. #. @@ -25005,5 +24998,5 @@ #. 50000 #. -#. +#. #. #. @@ -25012,5 +25005,5 @@ #. 50000 #. -#. +#. #. #. @@ -25019,5 +25012,5 @@ #. 50000 #. -#. +#. #. #. @@ -25026,5 +25019,5 @@ #. 50000 #. -#. +#. #. #. @@ -25033,5 +25026,5 @@ #. 50000 #. -#. +#. #. #. @@ -25040,5 +25033,5 @@ #. 50000 #. -#. +#. #. #. @@ -25047,5 +25040,5 @@ #. 50000 #. -#. +#. #. #. @@ -25054,5 +25047,5 @@ #. 50000 #. -#. +#. #. #. @@ -25061,5 +25054,5 @@ #. 50000 #. -#. +#. #. #. @@ -25068,5 +25061,5 @@ #. 50000 #. -#. +#. #. #. @@ -25075,5 +25068,5 @@ #. 50000 #. -#. +#. #. #. @@ -25082,5 +25075,5 @@ #. 50000 #. -#. +#. #. #. @@ -25089,5 +25082,5 @@ #. 50000 #. -#. +#. #. #. @@ -25097,5 +25090,5 @@ #. 50000 #. -#. +#. #. #. @@ -25105,5 +25098,5 @@ #. 50000 #. -#. +#. #. #. @@ -25113,5 +25106,5 @@ #. 50000 #. -#. +#. #. #. @@ -25121,5 +25114,5 @@ #. 50000 #. -#. +#. #. #. @@ -25129,5 +25122,5 @@ #. 50000 #. -#. +#. #. #. @@ -25137,5 +25130,5 @@ #. 50000 #. -#. +#. #. #. @@ -25145,5 +25138,5 @@ #. 50000 #. -#. +#. #. #. @@ -25153,5 +25146,5 @@ #. 50000 #. -#. +#. #. #. @@ -25161,5 +25154,5 @@ #. 50000 #. -#. +#. #. #. @@ -25170,5 +25163,5 @@ #. 50000 #. -#. +#. #. #. @@ -25178,5 +25171,5 @@ #. 50000 #. -#. +#. #. #. @@ -25186,5 +25179,5 @@ #. 50000 #. -#. +#. #. #. @@ -25194,5 +25187,5 @@ #. 50000 #. -#. +#. #. #. @@ -25202,5 +25195,5 @@ #. 50000 #. -#. +#. #. #. @@ -25210,5 +25203,5 @@ #. 50000 #. -#. +#. #. #. @@ -25218,5 +25211,5 @@ #. 50000 #. -#. +#. #. #. @@ -25226,5 +25219,5 @@ #. 50000 #. -#. +#. #. #. @@ -25234,5 +25227,5 @@ #. 50000 #. -#. +#. #. #. @@ -25242,5 +25235,5 @@ #. 50000 #. -#. +#. #. #. @@ -25250,5 +25243,5 @@ #. 50000 #. -#. +#. #. #. @@ -25258,5 +25251,5 @@ #. 50000 #. -#. +#. #. #. @@ -25266,5 +25259,5 @@ #. 50000 #. -#. +#. #. #. @@ -25274,5 +25267,5 @@ #. 50000 #. -#. +#. #. #. @@ -25282,5 +25275,5 @@ #. 50000 #. -#. +#. #. #. @@ -25290,5 +25283,5 @@ #. 50000 #. -#. +#. #. #. @@ -25298,5 +25291,5 @@ #. 50000 #. -#. +#. #. #. @@ -25306,5 +25299,5 @@ #. 50000 #. -#. +#. #. #. @@ -25314,5 +25307,5 @@ #. 50000 #. -#. +#. #. #. @@ -25321,5 +25314,5 @@ #. 50000 #. -#. +#. #. #. @@ -25351,5 +25344,5 @@ #. 50000 #. -#. +#. #. #. @@ -25359,5 +25352,5 @@ #. 50000 #. -#. +#. #. #. @@ -25367,7 +25360,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25382,5 +25375,5 @@ #. 50000 #. -#. +#. #. #. @@ -25390,5 +25383,5 @@ #. 50000 #. -#. +#. #. #. @@ -25398,5 +25391,5 @@ #. 50000 #. -#. +#. #. #. @@ -25406,5 +25399,5 @@ #. 50000 #. -#. +#. #. #. @@ -25414,5 +25407,5 @@ #. 50000 #. -#. +#. #. #. @@ -25422,5 +25415,5 @@ #. 50000 #. -#. +#. #. #. @@ -25430,5 +25423,5 @@ #. 50000 #. -#. +#. #. #. @@ -25444,7 +25437,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25454,5 +25447,5 @@ #. 50000 #. -#. +#. #. #. @@ -25462,5 +25455,5 @@ #. 50000 #. -#. +#. #. #. @@ -25470,5 +25463,5 @@ #. 50000 #. -#. +#. #. #. @@ -25478,5 +25471,5 @@ #. 50000 #. -#. +#. #. #. @@ -25486,5 +25479,5 @@ #. 50000 #. -#. +#. #. #. @@ -25494,5 +25487,5 @@ #. 50000 #. -#. +#. #. #. @@ -25502,5 +25495,5 @@ #. 50000 #. -#. +#. #. #. @@ -25510,5 +25503,5 @@ #. 50000 #. -#. +#. #. #. @@ -25518,5 +25511,5 @@ #. 50000 #. -#. +#. #. #. @@ -25526,5 +25519,5 @@ #. 50000 #. -#. +#. #. #. @@ -25534,5 +25527,5 @@ #. 50000 #. -#. +#. #. #. @@ -25542,5 +25535,5 @@ #. 50000 #. -#. +#. #. #. @@ -25550,5 +25543,5 @@ #. 50000 #. -#. +#. #. #. @@ -25558,5 +25551,5 @@ #. 50000 #. -#. +#. #. #. @@ -25566,5 +25559,5 @@ #. 50000 #. -#. +#. #. #. @@ -25574,5 +25567,5 @@ #. 50000 #. -#. +#. #. #. @@ -25582,5 +25575,5 @@ #. 50000 #. -#. +#. #. #. @@ -25590,5 +25583,5 @@ #. 50000 #. -#. +#. #. #. @@ -25598,5 +25591,5 @@ #. 50000 #. -#. +#. #. #. @@ -25606,5 +25599,5 @@ #. 50000 #. -#. +#. #. #. @@ -25614,5 +25607,5 @@ #. 50000 #. -#. +#. #. #. @@ -25622,5 +25615,5 @@ #. 50000 #. -#. +#. #. #. @@ -25630,5 +25623,5 @@ #. 50000 #. -#. +#. #. #. @@ -25638,5 +25631,5 @@ #. 50000 #. -#. +#. #. #. @@ -25646,5 +25639,5 @@ #. 50000 #. -#. +#. #. #. @@ -25654,5 +25647,5 @@ #. 50000 #. -#. +#. #. #. @@ -25662,5 +25655,5 @@ #. 50000 #. -#. +#. #. #. @@ -25670,5 +25663,5 @@ #. 50000 #. -#. +#. #. #. @@ -25678,5 +25671,5 @@ #. 50000 #. -#. +#. #. #. @@ -25686,5 +25679,5 @@ #. 50000 #. -#. +#. #. #. @@ -25694,5 +25687,5 @@ #. 50000 #. -#. +#. #. #. @@ -25702,5 +25695,5 @@ #. 50000 #. -#. +#. #. #. @@ -25710,5 +25703,5 @@ #. 50000 #. -#. +#. #. #. @@ -25718,5 +25711,5 @@ #. 50000 #. -#. +#. #. #. @@ -25726,5 +25719,5 @@ #. 50000 #. -#. +#. #. #. @@ -25734,5 +25727,5 @@ #. 50000 #. -#. +#. #. #. @@ -25742,5 +25735,5 @@ #. 50000 #. -#. +#. #. #. @@ -25750,5 +25743,5 @@ #. 50000 #. -#. +#. #. #. @@ -25758,5 +25751,5 @@ #. 50000 #. -#. +#. #. #. @@ -25766,5 +25759,5 @@ #. 50000 #. -#. +#. #. #. @@ -25774,5 +25767,5 @@ #. 50000 #. -#. +#. #. #. @@ -25782,5 +25775,5 @@ #. 50000 #. -#. +#. #. #. @@ -25816,7 +25809,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25826,5 +25819,5 @@ #. 50000 #. -#. +#. #. #. @@ -25834,5 +25827,5 @@ #. 50000 #. -#. +#. #. #. @@ -25842,5 +25835,5 @@ #. 50000 #. -#. +#. #. #. @@ -25850,5 +25843,5 @@ #. 50000 #. -#. +#. #. #. @@ -25858,5 +25851,5 @@ #. 50000 #. -#. +#. #. #. @@ -25866,5 +25859,5 @@ #. 50000 #. -#. +#. #. #. @@ -25874,5 +25867,5 @@ #. 50000 #. -#. +#. #. #. @@ -25889,5 +25882,5 @@ #. 50000 #. -#. +#. #. #. @@ -25897,5 +25890,5 @@ #. 50000 #. -#. +#. #. #. @@ -25905,5 +25898,5 @@ #. 50000 #. -#. +#. #. #. @@ -25913,5 +25906,5 @@ #. 50000 #. -#. +#. #. #. @@ -25921,5 +25914,5 @@ #. 50000 #. -#. +#. #. #. @@ -25929,5 +25922,5 @@ #. 50000 #. -#. +#. #. #. @@ -25938,5 +25931,5 @@ #. 50000 #. -#. +#. #. #. @@ -25946,5 +25939,5 @@ #. 50000 #. -#. +#. #. #. @@ -25954,5 +25947,5 @@ #. 40000 #. -#. +#. #. #. @@ -25962,5 +25955,5 @@ #. 50000 #. -#. +#. #. #. @@ -25969,5 +25962,5 @@ #. 40000 #. -#. +#. #. #. @@ -25976,5 +25969,5 @@ #. 40000 #. -#. +#. #. #. @@ -25992,7 +25985,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26002,5 +25995,5 @@ #. 50000 #. -#. +#. #. #. @@ -26010,5 +26003,5 @@ #. 50000 #. -#. +#. #. #. @@ -26018,5 +26011,5 @@ #. 50000 #. -#. +#. #. #. @@ -26026,5 +26019,5 @@ #. 50000 #. -#. +#. #. #. @@ -26034,5 +26027,5 @@ #. 50000 #. -#. +#. #. #. @@ -26042,5 +26035,5 @@ #. 50000 #. -#. +#. #. #. @@ -26050,5 +26043,5 @@ #. 50000 #. -#. +#. #. #. @@ -26058,5 +26051,5 @@ #. 50000 #. -#. +#. #. #. @@ -26066,5 +26059,5 @@ #. 50000 #. -#. +#. #. #. @@ -26083,5 +26076,5 @@ #. 50000 #. -#. +#. #. #. @@ -26095,5 +26088,5 @@ #. 50000 #. -#. +#. #. #. @@ -26107,5 +26100,5 @@ #. 50000 #. -#. +#. #. #. @@ -26115,5 +26108,5 @@ #. 50000 #. -#. +#. #. #. @@ -26127,5 +26120,5 @@ #. 50000 #. -#. +#. #. #. @@ -26139,5 +26132,5 @@ #. 50000 #. -#. +#. #. #. @@ -26151,6 +26144,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26160,5 +26153,5 @@ #. 50000 #. -#. +#. #. #. @@ -26172,5 +26165,5 @@ #. 50000 #. -#. +#. #. #. @@ -26184,5 +26177,5 @@ #. 50000 #. -#. +#. #. #. @@ -26196,5 +26189,5 @@ #. 50000 #. -#. +#. #. #. @@ -26208,5 +26201,5 @@ #. 50000 #. -#. +#. #. #. @@ -26220,5 +26213,5 @@ #. 50000 #. -#. +#. #. #. @@ -26228,7 +26221,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26238,5 +26231,5 @@ #. 50000 #. -#. +#. #. #. @@ -26246,5 +26239,5 @@ #. 50000 #. -#. +#. #. #. @@ -26254,5 +26247,5 @@ #. 50000 #. -#. +#. #. #. @@ -26262,5 +26255,5 @@ #. 50000 #. -#. +#. #. #. @@ -26277,5 +26270,5 @@ #. 50000 #. -#. +#. #. #. @@ -26288,5 +26281,5 @@ #. 50000 #. -#. +#. #. #. @@ -26300,5 +26293,5 @@ #. 50000 #. -#. +#. #. #. @@ -26312,5 +26305,5 @@ #. 50000 #. -#. +#. #. #. @@ -26324,5 +26317,5 @@ #. 50000 #. -#. +#. #. #. @@ -26333,5 +26326,5 @@ #. 50000 #. -#. +#. #. #. @@ -26341,5 +26334,5 @@ #. 50000 #. -#. +#. #. #. @@ -26349,5 +26342,5 @@ #. 50000 #. -#. +#. #. #. @@ -26357,5 +26350,5 @@ #. 50000 #. -#. +#. #. #. @@ -26365,5 +26358,5 @@ #. 50000 #. -#. +#. #. #. @@ -26380,5 +26373,5 @@ #. 50000 #. -#. +#. #. #. @@ -26392,5 +26385,5 @@ #. 50000 #. -#. +#. #. #. @@ -26404,5 +26397,5 @@ #. 50000 #. -#. +#. #. #. @@ -26416,5 +26409,5 @@ #. 50000 #. -#. +#. #. #. @@ -26428,5 +26421,5 @@ #. 50000 #. -#. +#. #. #. @@ -26440,5 +26433,5 @@ #. 50000 #. -#. +#. #. #. @@ -26447,7 +26440,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26457,5 +26450,5 @@ #. 50000 #. -#. +#. #. #. @@ -26465,5 +26458,5 @@ #. 50000 #. -#. +#. #. #. @@ -26473,5 +26466,5 @@ #. 50000 #. -#. +#. #. #. @@ -26481,5 +26474,5 @@ #. 50000 #. -#. +#. #. #. @@ -26489,5 +26482,5 @@ #. 50000 #. -#. +#. #. #. @@ -26497,5 +26490,5 @@ #. 50000 #. -#. +#. #. #. @@ -26505,5 +26498,5 @@ #. 50000 #. -#. +#. #. #. @@ -26520,7 +26513,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26530,5 +26523,5 @@ #. 50000 #. -#. +#. #. #. @@ -26538,5 +26531,5 @@ #. 50000 #. -#. +#. #. #. @@ -26546,5 +26539,5 @@ #. 50000 #. -#. +#. #. #. @@ -26554,5 +26547,5 @@ #. 50000 #. -#. +#. #. #. @@ -26568,5 +26561,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26615,5 +26608,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26623,5 +26616,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26631,5 +26624,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26639,5 +26632,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26647,5 +26640,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26655,5 +26648,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26663,5 +26656,5 @@ #. 50000 #. -#. +#. #. #. @@ -26671,5 +26664,5 @@ #. 50000 #. -#. +#. #. #. @@ -26679,5 +26672,5 @@ #. 50000 #. -#. +#. #. #. @@ -26687,5 +26680,5 @@ #. 50000 #. -#. +#. #. #. @@ -26695,5 +26688,5 @@ #. 50000 #. -#. +#. #. #. @@ -26703,5 +26696,5 @@ #. 50000 #. -#. +#. #. #. @@ -26721,5 +26714,5 @@ #. 50000 #. -#. +#. #. #. @@ -26728,5 +26721,5 @@ #. 50000 #. -#. +#. #. #. @@ -26735,5 +26728,5 @@ #. 50000 #. -#. +#. #. #. @@ -26742,5 +26735,5 @@ #. 40000 #. -#. +#. #. #. @@ -26749,5 +26742,5 @@ #. 40000 #. -#. +#. #. #. @@ -26756,5 +26749,5 @@ #. 40000 #. -#. +#. #. #. @@ -26849,5 +26842,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -26855,28 +26848,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 @@ -26991,5 +26984,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27002,5 +26995,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27025,6 +27018,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27033,6 +27026,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27047,6 +27040,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 @@ -27060,6 +27053,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 @@ -27079,6 +27072,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27102,6 +27095,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 @@ -27114,8 +27107,20 @@ msgstr "" +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Ef þetta er valið verða allar breytingarnar sendar í einni fyrirspurn. En " +#~ "ef ekki verður gerð ein fyrirspurn fyrir hvern hlut sem breytt var" + +#~ msgid "Sync clock" +#~ msgstr "Samstilla klukkur" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Opna myndir með AgPifoJ..." + #~ msgid "Unsaved Changes" #~ msgstr "Óvistaðar breytingar" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð." @@ -27124,5 +27129,4 @@ #~ msgstr "OSM notandanafn (getur verið tölvupóstfang)" -#, java-format #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." @@ -27145,5 +27149,4 @@ #~ msgstr "Skrá fannst ekki." -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}" @@ -27169,5 +27172,6 @@ #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra." +#~ msgstr "" +#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra." #~ msgid "Be sure to include the following information:" @@ -27177,15 +27181,10 @@ #~ msgstr "Bæta völdum hlutum við venslin" -#~ msgid "Please enter a search string" -#~ msgstr "Sláðu inn leitarstreng" - #~ msgid "unnamed" #~ msgstr "ónefnt" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Árekstrar: {0}" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27200,6 +27199,6 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" #~ "Valdir vegir eru stak í mismundandi venslum. Viltu sameina þá þrátt fyrir " @@ -27212,5 +27211,4 @@ #~ msgstr "Upphala til OSM..." -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Vinsamlegast sendu meldinguna á {0}" @@ -27222,6 +27220,6 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" #~ "Reyndu að uppfæra í nýjustu útgáfuna af JOSM og allar viðbætur áður en þú " @@ -27238,9 +27236,9 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Valdir hnútar eru stök í mismundandi venslum. Viltu sameina þá þrátt fyrir " -#~ "það?" +#~ "Valdir hnútar eru stök í mismundandi venslum. Viltu sameina þá þrátt " +#~ "fyrir það?" #~ msgid "Select a bookmark first." @@ -27256,7 +27254,4 @@ #~ msgstr "Get ekki lesið niðurstöðu staðarleitar frá þjóni" -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Sláðu inn hnitin fyrst" - #~ msgid "zoom" #~ msgstr "þysja" @@ -27283,9 +27278,7 @@ #~ msgstr "Gagnalag" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Nota forstillinguna „{0}“" @@ -27335,8 +27328,4 @@ #~ msgstr "Færa niður" -#~ msgid "Sort" -#~ msgstr "Raða" - -#, java-format #~ msgid "Members: {0} (linked: {1})" #~ msgstr "Stök: {0} (tengd: {1})" @@ -27346,5 +27335,6 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "Engin gögn til að uppfæra. Þú þarft að niðurhala gögnum fyrst." @@ -27355,5 +27345,4 @@ #~ msgstr "Sameina þá" -#, java-format #~ msgid "Do you really want to delete layer ''{0}''?" #~ msgstr "Ert þú viss um að þú viljir eyða laginu „{0}“?" @@ -27365,20 +27354,17 @@ #~ msgstr "Opna nýtt breytingarsett og loka því strax" -#, java-format #~ msgid "Use the existing changeset {0} and close it after upload" #~ msgstr "Nota opið breytingarsett #{0} og loka því" -#, java-format #~ msgid "Use the existing changeset {0} and leave it open" #~ msgstr "Nota opið breytingarsett #{0} og skilja það eftir opið" #~ msgid "" -#~ "Select to upload the data using a new changeset and to leave the changeset " -#~ "open after the upload" +#~ "Select to upload the data using a new changeset and to leave the " +#~ "changeset open after the upload" #~ msgstr "" -#~ "Nýtt breytingarsett verður búið til og það skilið eftir opið svo hægt sé að " -#~ "bæta við frekari breytingum síðar meir" - -#, java-format +#~ "Nýtt breytingarsett verður búið til og það skilið eftir opið svo hægt sé " +#~ "að bæta við frekari breytingum síðar meir" + #~ msgid "" #~ "Select to upload to the existing changeset {0} and to close the changeset " @@ -27388,5 +27374,4 @@ #~ "breytingunni hefur verið upphlaðið" -#, java-format #~ msgid "" #~ "Select to upload to the existing changeset {0} and to leave the changeset " @@ -27399,5 +27384,4 @@ #~ msgstr "Endurhlaða vallistann" -#, java-format #~ msgid "" #~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " @@ -27406,11 +27390,10 @@ #~ "Valið „{0}“ er notað af venslunum „{1}“
Eyða úr venslunum?" -#, java-format #~ msgid "" -#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " -#~ "from relation?" +#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." +#~ "
Delete from relation?" #~ msgstr "" -#~ "Valið „{0}“ er notað af venslunum „{1}“ með hlutverkið „{2}“.
Eyða " -#~ "úr venslunum?" +#~ "Valið „{0}“ er notað af venslunum „{1}“ með hlutverkið „{2}“." +#~ "
Eyða úr venslunum?" #~ msgid "Upload to OSM API failed" Index: /applications/editors/josm/i18n/po/it.po =================================================================== --- /applications/editors/josm/i18n/po/it.po (revision 18974) +++ /applications/editors/josm/i18n/po/it.po (revision 18975) @@ -5,5 +5,5 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 16:20+0100\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" "PO-Revision-Date: 2009-11-28 21:43+0000\n" "Last-Translator: David Paleino \n" @@ -13,5 +13,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:06+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:18+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -26,6 +26,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 @@ -42,7 +42,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 @@ -58,19 +58,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 @@ -83,9 +82,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" @@ -104,6 +103,5 @@ #, java-format msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" -"Impossibile leggere il file ''{0}''.
Errore:
{1}" +msgstr "Impossibile leggere il file ''{0}''.
Errore:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -114,5 +112,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 @@ -135,9 +133,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 @@ -153,20 +151,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 @@ -185,7 +179,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 "Errore" @@ -265,5 +259,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 "Estensioni" @@ -312,4 +306,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 @@ -317,8 +313,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 @@ -328,29 +324,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 @@ -379,6 +373,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 "" "Non ci sono livelli al quale unire il livello sorgente ''{0}''." @@ -431,14 +425,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 "Latitudine" #: ../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 "Longitudine" @@ -464,10 +458,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 @@ -498,19 +492,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 @@ -519,9 +516,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 @@ -537,7 +531,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 @@ -549,11 +543,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" @@ -641,5 +635,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}" @@ -694,10 +688,10 @@ "di nodi)" -#: ../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 "Unisci {0} percorsi" -#: ../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 "Selezionare almeno due percorsi da unire." @@ -716,19 +710,19 @@ msgstr "Seleziona qualcosa da copiare." +#: ../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 "Crea cerchio" -#: ../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 "Crea un cerchio a partire da tre nodi selezionati" -#: ../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 "Questi nodi non sono disposti su una circonferenza. Annullo." -#: ../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 " @@ -741,9 +735,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 @@ -817,21 +811,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" @@ -839,6 +837,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 @@ -867,5 +865,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 "Duplica" @@ -922,8 +920,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 @@ -931,5 +927,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 @@ -942,8 +938,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 @@ -962,8 +958,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 @@ -986,13 +982,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 @@ -1034,4 +1031,108 @@ "Visualizza le informazioni dell'oggetto OSM su nodi, percorsi o relazioni." +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "Unisci aree sovrapposte" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Joins areas that overlap each other" +msgstr "Unisci aree che si sovrappongono l'un l'altra" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +msgid "Only up to two areas can be joined at the moment." +msgstr "Attualmente solo due aree possono essere unite." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#, java-format +msgid "\"{0}\" is not closed and therefore can't be joined." +msgstr "\"{0}\" non è chiuso e quindi non può essere unito." + +#: ../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 "" +"La/le strade selezionate hanno dei nodi fuori dalla zona dei dati " +"scaricati.\n" +"Alcuni nodi potrebbero essere cancellati accidentalmente.\n" +"Sei veramente sicuro di continuare ?" + +#: ../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 "Si prega di annullare se non si è sicuri" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 +msgid "Please select at least one closed way the should be joined." +msgstr "Seleziona almeno un percorso chiuso che dovrebbe essere unito." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +msgid "No intersection found. Nothing was changed." +msgstr "" +"Non è stata trovata alcuna intersezione. Non è stata apportata alcuna " +"modifica." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +msgid "Added node on all intersections" +msgstr "Nodo aggiunto su tutte le intersezioni" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgid "Delete Ways that are not part of an inner multipolygon" +msgstr "Elimina i percorsi che non fanno parte di un multi-poligono interno" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +msgid "Fix relations" +msgstr "Correggi le relazioni" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgid "Joined self-overlapping area" +msgstr "L'area auto-sovrapposta è stata unita" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +msgid "Joined overlapping areas" +msgstr "Le aree sovrapposte sono state unite" + +#: ../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 "" +"Alcuni percorsi facevano parte di relazioni che sono state modificate. Per " +"favore verifica che non siano stati introdotti errori." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +msgid "Enter values for all conflicts." +msgstr "Inserire dei valori per tutti i conflitti." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Risolvi conflitti" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +msgid "Fix tag conflicts" +msgstr "Correggi i conflitti di etichette" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +msgid "Removed Element from Relations" +msgstr "Sono stati rimossi elementi dalle Relazioni" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +msgid "Join Areas: Remove Short Ways" +msgstr "Unisi Aree: Elimina le way corte" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +msgid "Closed Way" +msgstr "Strada chiusa (anello)" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgid "Remove tags from inner ways" +msgstr "Rimuovi i tag dalle way interne" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +msgid "Join Areas Function" +msgstr "Funzione di unione delle Aree" + #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 @@ -1051,4 +1152,49 @@ msgstr "Nessuna scorciatoia" +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Jump To Position" +msgstr "Vai alla posizione" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Opens a dialog that allows to jump to a specific location" +msgstr "" +"Apre una finestra di dialogo che consente di saltare ad un indirizzo " +"specifico." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57 +msgid "Enter Lat/Lon to jump to position." +msgstr "Inserire Lat/Lon a cui andare." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 +msgid "You can also paste an URL from www.openstreetmap.org" +msgstr "Puoi anche incollare un URL da www.openstreetmap.org" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 +msgid "Zoom (in metres)" +msgstr "Zoom (in metri)" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 +msgid "URL" +msgstr "Indirizzo URL" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 +msgid "Jump there" +msgstr "Salta lì" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 +msgid "Jump to Position" +msgstr "Salta alla posizione" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Could not parse Latitude, Longitude or Zoom. Please check." +msgstr "" +"Non è possibile interpretare la Latitudine, la Longitudine o lo Zoom. " +"Verifica." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Unable to parse Lon/Lat" +msgstr "Impossibile interpretare longitudine/latitudine" + #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" @@ -1059,26 +1205,26 @@ msgstr "Unisci il livello corrente con un altro livello" +#: ../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 "Unisci nodi" -#: ../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 "Unisci i nuovi nodi in quello più vecchio." -#: ../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 "Seleziona almeno due nodi da unire." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126 msgid "Abort Merging" msgstr "Annulla unione" -#: ../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 "Cliccare per annullare l'unione dei nodi" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135 #, java-format msgid "" @@ -1088,5 +1234,5 @@ "quale è ancora utilizzato." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231 #, java-format msgid "Merge {0} nodes" @@ -1468,6 +1614,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 "" "Visualizza il rapporto dello stato contenente informazioni utili che possono " @@ -1489,9 +1634,43 @@ #: ../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 "Chiudi" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Semplifica percorso" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Elimina i nodi non necessari dal percorso." + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "Selezionare almeno un percorso da semplificare." + +#: ../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] "" +"La selezione contiene {0} percorso. Sei sicuro di volerlo semplificare?" +msgstr[1] "" +"La selezione contiene {0} percorsi. Sei sicuro di volerli semplificare tutti?" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 +msgid "Are you sure?" +msgstr "Sei sicuro?" + +#: ../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] "Semplifica percorso (rimuovi {0} nodo)" +msgstr[1] "Semplifica percorso (rimuovi {0} nodi)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1625,6 +1804,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 "" "* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure" @@ -1710,15 +1888,15 @@ #. 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 "Scarica dati" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "No current dataset found" msgstr "Non è stato trovato nessun dataset corrente" -#: ../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" @@ -1726,9 +1904,9 @@ "Nell''insieme di dati corrente non è stato trovato un oggetto con id {0}" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Update selection" msgstr "Aggiorna selezione" -#: ../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)" @@ -1737,31 +1915,31 @@ "(scarica nuovamente i dati)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 msgid "Update Selection" msgstr "Aggiorna la selezione" +#: ../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 "Selezione vuota" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 msgid "Update objects" msgstr "Aggiorna oggetti" -#: ../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 "Carica dati" -#: ../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 "" "Carica tutte le modifiche presenti nel livello dei dati attivo sul server OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 #, java-format msgid "" @@ -1772,35 +1950,35 @@ "necessario risolvere prima questi." -#: ../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 "Nessun cambiamento da caricare." -#: ../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 "Niente da caricare. Prima è necessario ottenere dei dati." -#: ../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 "Sincronizza solo il nodo {0}" -#: ../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 "Sincronizza solo il percorso {0}" -#: ../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 "Sincronizza solo la relazione {0}" -#: ../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 "Sincronizza l'intero dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1808,42 +1986,40 @@ "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.
" +"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 "" "Caricamento fallito perché il server possiede una " "versione più recente di uno
dei tuoi nodi, percorsi, o relazioni.
Il " -"conflitto è stato causato da {0} con identificativo " -"{1},
il server possiede la versione {2}, la tua versione " -"è {3}.

Cliccare {4} per sincronizzare solamente la " +"conflitto è stato causato da {0} con identificativo " +"{1},
il server possiede la versione {2}, la tua versione è {3}." +"

Cliccare {4} per sincronizzare solamente la " "primitiva che causa il conflitto.
Cliccare {5} per " "sincronizzare tutto l''insieme di dati locale con il server.
Cliccare " -"{6} per annullare e continuare ad apportare delle " -"modifiche.
" - -#: ../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 +"{6} per annullare e continuare ad apportare delle modifiche." +"
" + +#: ../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 "Rilevati conflitti" -#: ../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.
" +"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 "" "Caricamento fallito perché il server possiede una " -"versione più recente di uno
dei tuoi nodi, percorsi, o " -"relazioni.

Cliccare {0} per sincronizzare tutto " -"l''insieme di dati locale con il server.
Cliccare {1} " -"per annullare e continuare ad apportare delle modifiche.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 +"versione più recente di uno
dei tuoi nodi, percorsi, o relazioni." +"

Cliccare {0} per sincronizzare tutto l''insieme di " +"dati locale con il server.
Cliccare {1} per annullare e " +"continuare ad apportare delle modifiche.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1856,22 +2032,22 @@ "nuovamente con un gruppo di modifiche nuovo o esistente aperto." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 msgid "Changeset closed" msgstr "Gruppo di modifiche chiuso" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 msgid "Prepare conflict resolution" msgstr "Prepara la risoluzione dei conflitti" -#: ../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 "Cliccare per scaricare tutti i percorsi da cui dipende il nodo {0}" -#: ../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 "Cliccare per annullare e per ritornare alla modifica della mappa" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 #, java-format msgid "" @@ -1887,10 +2063,10 @@ "risolti nella relativa finestra." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 msgid "Node still in use" msgstr "Nodo ancora in uso" -#: ../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" @@ -1899,5 +2075,5 @@ "atteso" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 msgid "Updating primitive" msgstr "Aggiornamento della primitiva" @@ -1909,6 +2085,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 "" @@ -1919,5 +2095,5 @@ "questo oggetto e riprovo a caricare." -#: ../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." @@ -1926,38 +2102,36 @@ "caricamento." -#: ../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 "Caricamento di {0} oggetti ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 -#, java-format -msgid "" -"Ignoring caught exception because upload is canceled. Exception is: {0}" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" msgstr "" "L''eccezione che è stata generata verrà ignorata perché il caricamento è " "stato annullato. L''eccezione è: {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 msgid "Upload selection" msgstr "Carica selezione" -#: ../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 "Carica sul server OSM tutte le modifiche nella selezione corrente" -#: ../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 "Verifica degli elementi da cui dipendevano gli oggetti eliminati" -#: ../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 "Lettura degli elementi da cui dipende ''{0}''" -#: ../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 "" -"Verifica degli elementi genitori eliminati nell'insieme di dati locale" +msgstr "Verifica degli elementi genitori eliminati nell'insieme di dati locale" #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:23 @@ -2123,6 +2297,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 "" "Ci sono {0} primitive nel proprio insieme di dati locale " @@ -2199,38 +2373,38 @@ msgstr "selezionato" -#: ../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 "Non si può disegnare un nodo fuori dal mondo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Aggiungi nodo" -#: ../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 "Aggiungi un nodo al percorso" -#: ../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 "Collega un percorso esistente al nodo" -#: ../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 "Aggiungi un nodo ad un percorso esistente" -#: ../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 "Aggiungi un nodo al percorso e connetti" -#: ../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 "Crea un nuovo nodo." -#: ../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 "Seleziona il nodo sotto il cursore." -#: ../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." @@ -2239,14 +2413,14 @@ msgstr[1] "Inserisci un nuovo nodo nei {0} percorsi." -#: ../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 "Inizia un nuovo percorso dall'ultimo nodo." -#: ../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 "Continua un percorso dall'ultimo nodo." -#: ../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 "Termina tracciamento." @@ -2283,6 +2457,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 "" "Trascinare la testina e rilasciarla in prossimità di un tracciato per " @@ -2379,7 +2553,7 @@ "move zoom with right button" msgstr "" -"Cambiare il livello di ingrandimento mediante trascinamento o premendo " -"Ctrl+. or Ctrl+,; muoversi con Ctrl+su,sinistra,giù,destra; muovere il " -"livello di ingrandimento con il tasto destro" +"Cambiare il livello di ingrandimento mediante trascinamento o premendo Ctrl" +"+. or Ctrl+,; muoversi con Ctrl+su,sinistra,giù,destra; muovere il livello " +"di ingrandimento con il tasto destro" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 @@ -2394,5 +2568,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." @@ -2481,12 +2655,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - tutti gli oggetti modificati dall''utente" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - oggetto con un dato ID (0 per nuovi oggetti)" -#: ../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 "nodes:... - oggetto con un dato numero di nodi" -#: ../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-" @@ -2496,21 +2675,21 @@ "etichette:min-max)" -#: ../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 "modified - tutti gli oggetti modificati" -#: ../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 "selected - tutti gli oggetti selezionati" -#: ../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 "incomplete - tutti gli oggetti incompleti" -#: ../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 "untagged - tutti gli oggetti provi di proprietà" -#: ../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" @@ -2519,5 +2698,5 @@ "corrispondenti all'espressione" -#: ../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" @@ -2526,5 +2705,5 @@ "oggetti corrispondenti all'espressione" -#: ../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 "" @@ -2532,5 +2711,5 @@ "logico ''or''" -#: ../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 "" @@ -2538,9 +2717,9 @@ "contiene :)" -#: ../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 "Utilizzare ( e ) per raggruppare le espressioni" -#: ../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 @@ -2550,33 +2729,33 @@ msgstr "Filtro" -#: ../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 "Cerca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Submit filter" msgstr "Invia filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Start Search" msgstr "Inizia Ricerca" -#: ../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 "Nessuna corrispondenza trovata per ''{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 "Nulla è stato aggiunto alla selezione cercando ''{0}''" -#: ../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 "Nulla è stato rimosso dalla selezione cercando ''{0}''" -#: ../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}''" @@ -2584,22 +2763,22 @@ "Nella selezione non è stato trovato alcunché durante la ricerca di ''{0}''" -#: ../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 "Trovate {0} corrispondenze" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2613,5 +2792,5 @@ "{2}" -#: ../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 "" @@ -2619,11 +2798,10 @@ "etichetta. Esempio di utilizzo: key=value" -#: ../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 "" -"Errore nella sintassi dello schema: lo schema {0} in {1} non è valido!" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 +msgstr "Errore nella sintassi dello schema: lo schema {0} in {1} non è valido!" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2632,26 +2810,26 @@ "relazione" -#: ../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 "Token inaspettato: {0}" -#: ../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 "Argomenti mancanti per l'operatore booleano OR." -#: ../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 "Argomento mancante per l'operatore booleano NOT." -#: ../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 "Era attesa una parentesi chiusa." -#: ../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 "Numero errato di parametri per l'operatore tags." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 #, java-format msgid "" @@ -2662,9 +2840,9 @@ "il numero di etichette o un intervallo, per esempio tags:1 oppure tags:2-5" -#: ../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 "Numero errato di parametri per operatore sui nodi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 #, java-format msgid "" @@ -2675,5 +2853,5 @@ "richiede un numero o un intervallo di nodi, per esempio nodes:10-20" -#: ../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." @@ -2724,8 +2902,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" +#, fuzzy, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" msgstr "" "Attenzione: troncamento automatico del valore del tag {0} sulla primitiva " @@ -2733,7 +2910,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2878,5 +3055,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 "Doppio conflitto" @@ -2897,5 +3074,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 "" @@ -2916,20 +3094,20 @@ msgstr "Impossibile risolvere il conflitto irrisolto" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 +#: ../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 "Il parametro ''''{0}'''' non deve essere vuoto" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61 +#: ../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:107 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 msgid "At least one object to delete requird, got empty collection" msgstr "" "E' richiesto almeno un oggetto da eliminare, ottenuta una collezione vuota" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177 #, java-format msgid "Delete {0} object" @@ -2938,5 +3116,5 @@ msgstr[1] "Elimina {0} oggetti" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2945,5 +3123,5 @@ msgstr[1] "Elimina {0} nodi" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2952,5 +3130,5 @@ msgstr[1] "Elimina {0} percorsi" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2961,10 +3139,10 @@ #. 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?" +#: ../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 "" "Stai per cancellare dei nodi fuori dall'area scaricata.
Questo potrebbe " @@ -2972,5 +3150,5 @@ "(che non puoi vedere).
Vuoi veramente cancellarli?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "Conferma di cancellazione" @@ -2988,15 +3166,15 @@ msgstr[1] "Sposta {0} nodi" -#: ../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 "Epurato oggetto ''{0}''" -#: ../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 "Epurati {0} oggetti" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154 #, java-format msgid "" @@ -3007,5 +3185,5 @@ "inferiore a 2. Al momento è {1}" -#: ../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}" @@ -3017,11 +3195,4 @@ msgstr "Risolvi conflitti nella lista dei membri della relazione {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "" -"Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più " -"disponibile" - #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 #, java-format @@ -3032,6 +3203,5 @@ #, java-format msgid "Remove way ''{0}'' at position {1} from relation ''{2}''" -msgstr "" -"Rimuovi il percorso ''{0}'' alla posizione {1} dalla relazione ''{2}''" +msgstr "Rimuovi il percorso ''{0}'' alla posizione {1} dalla relazione ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71 @@ -3101,5 +3271,5 @@ msgstr "Applicare?" -#: ../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 " @@ -3261,6 +3431,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 "" "Il file delle preferenze contiene degli errori.
Salvataggio del " @@ -3359,5 +3529,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3366,5 +3536,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3372,25 +3542,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 "S" #. 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 "N" #. 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 "O" #. 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 "E" #: ../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 @@ -3414,30 +3584,31 @@ msgstr "" "JOSM si aspettava di trovare la primitiva [{0} {1}] nell''insieme di dati, " -"ma non c''è. Si prega di riportare questo errore al sito " -"http://josm.openstreetmap.de . Questo non è un errore critico, si può " -"probabilmente continuare a lavorare senza problemi." +"ma non c''è. Si prega di riportare questo errore al sito http://josm." +"openstreetmap.de . Questo non è un errore critico, si può probabilmente " +"continuare a lavorare senza problemi." #: ../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}" @@ -3445,6 +3616,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 "" @@ -3507,24 +3678,24 @@ msgstr "F" -#: ../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 "Era atteso ID >= 0. Ottenuto {0}." -#: ../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 "Una primitiva con ID = 0 non può essere invisibile." -#: ../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 "Era atteso un ID > 0 . Ottenuto {0}." -#: ../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 "attesa versione > 0 . Ottenuto {0}." -#: ../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 " @@ -3532,5 +3703,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 "" @@ -3564,6 +3735,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}." @@ -3582,9 +3753,8 @@ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''." msgstr "" -"Era atteso che il valore del parametro ''{0}\" fosse nell''intervallo " -"0..{1}. Ottenuto ''{2}''." +"Era atteso che il valore del parametro ''{0}\" fosse nell''intervallo 0.." +"{1}. Ottenuto ''{2}''." #: ../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 @@ -3596,6 +3766,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 "" @@ -3606,135 +3775,135 @@ msgstr "il parametro {0} non è nell''intervallo 0..{1}, ottenuto {2}" -#: ../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 "Il percorso dello stile dell''area non è chiuso." -#: ../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 "il percorso multi-poligonale ''{0}'' non è chiuso." -#: ../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 "Eliminato il membro ''{0}'' nella relazione." -#: ../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 "Percorso ''{0}'' con meno di due punti." -#: ../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 "E' stato trovato più di un percorso \"from\"." -#: ../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 "E' stato trovato più di un percorso \"to\"." -#: ../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 "E' stata trovata più di una \"via\"." -#: ../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 "Ruolo ''{0}'' sconosciuto." -#: ../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 "Tipo di membro sconosciuto per ''{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 "Non è stato trovato un percorso \"from\"." -#: ../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 "Non è stato trovato un percorso \"to\"." -#: ../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 "Non è stato trovato alcun nodo o percorso \"via\"." -#: ../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 "Il percorso \"from\" non inizia o non finisce su un nodo \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../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 "Il percorso \"to\" non inizia o finisce su un nodo \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Il percorso \"from\" non inizia o finisce sul percorso \"via\"." -#: ../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 "Il percorso \"to\" non inizia o finisce sul percorso \"via\"." -#: ../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 "Non è stato trovato lo stile per la restrizione {0}." -#: ../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 "Intersezione tra i percorsi ''{0}'' e ''{1}''." -#: ../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 "Il percorso interno ''{0}'' è esterno." -#: ../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 "Regola ''{0}'' non utile per il percorso ''{1}''." -#: ../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 "Non-percorso ''{0}'' nel multi-poligono." -#: ../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 "Nessun percorso esterno per il multi-poligono ''{0}''." -#: ../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 "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono." -#: ../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 "Lo stile per il percorso esterno ''{0}'' è discordante." -#: ../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 "senza etichetta" -#: ../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 "testo" -#: ../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 "testo dell''area" -#: ../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 "Errore: {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}" @@ -3746,5 +3915,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 @@ -3763,5 +3932,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 @@ -3781,5 +3950,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 "sfondo" @@ -3897,9 +4066,8 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 #, java-format -msgid "" -"Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "" -"Impossibile leggere i segnalibri da
''{0}''
Errore generato: " -"{1}" +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" +"Impossibile leggere i segnalibri da
''{0}''
Errore generato: {1}" +"" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78 @@ -3913,5 +4081,5 @@ msgstr "Non mostrare di nuovo" -#: ../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 @@ -3919,32 +4087,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 "incompleto" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "strada" -#: ../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 "ferrovia" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "corso d'acqua" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "tipologia di area" -#: ../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" @@ -3953,5 +4121,5 @@ msgstr[1] "{0} nodi" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -4046,6 +4214,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "" -"Ridimensiona l'applet alla geometria data (formato: LARGHEZZAxALTEZZA)" +msgstr "Ridimensiona l'applet alla geometria data (formato: LARGHEZZAxALTEZZA)" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 @@ -4208,12 +4375,12 @@ "più usata." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "File" -#: ../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 @@ -4227,19 +4394,19 @@ msgstr "Modifica" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Visualizza" -#: ../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 "Strumenti" -#: ../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 "Preimpostati" -#: ../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 @@ -4250,5 +4417,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Audio" @@ -4292,42 +4459,42 @@ msgstr "scala" -#: ../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 "La longitudine geografica del puntatore del mouse." -#: ../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 "Il nome dell'oggetto sul puntatore del mouse." -#: ../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 "La latitudine geografica del puntatore del mouse." -#: ../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 "L'angolo tra il segmento di percorso corrente e quello precedente." -#: ../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 "Direzione della bussola del segmento che si sta disegnando." -#: ../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 "Lunghezza del segmento di percorso che si sta disegnando." -#: ../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 " "this list with the mouse.
" msgstr "" -"Cliccare con il tasto centrale nuovamente per proseguire nel " -"ciclo.
Tenere premuto CTRL per selezionare direttamente da questa lista " -"con il mouse.
" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +"Cliccare con il tasto centrale nuovamente per proseguire nel ciclo." +"
Tenere premuto CTRL per selezionare direttamente da questa lista con il " +"mouse.
" + +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(nessun oggetto)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "Utente:" @@ -4442,5 +4609,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" @@ -4449,5 +4616,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" @@ -4456,5 +4623,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" @@ -4473,5 +4640,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 @@ -4488,5 +4655,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" @@ -4562,22 +4729,22 @@ msgstr "Risoluzione conflitto" -#: ../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 "parametro attualmente fuori scala: ottenuto {0}" -#: ../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 "la lista nel ruolo {0} attualmente non partecipa ad alcun confronto" -#: ../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 "valore inaspettato per il parametro \"index\". Ottenuto {0}" -#: ../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." @@ -4671,6 +4838,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 "" "Copia i loro elementi selezionati alla fine della lista degli elementi uniti" @@ -4744,6 +4910,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" "Clicca {0} per iniziare l'unione tra le voci " @@ -4753,6 +4919,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" "Clicca {0} per terminare l'unione tra le voci " @@ -4815,6 +4981,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 "" "E'' stato generato un errore durante la comunicazione con il " @@ -4851,7 +5017,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 "" "Ci sono {0} primitive addizionali collegate alla relazione {1}
che " @@ -4877,6 +5043,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91 msgid "Properties in their dataset, i.e. the server dataset" -msgstr "" -"Proprietà nel loro insieme di dati, cioè l'insieme di dati del server" +msgstr "Proprietà nel loro insieme di dati, cioè l'insieme di dati del server" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:107 @@ -4992,6 +5157,6 @@ "dataset.
Do you agree?" msgstr "" -"JOSM dovrà eliminare la tua primitiva locale con identificativo " -"{0}
dall'insieme di dati.
Si è d'accordo?" +"JOSM dovrà eliminare la tua primitiva locale con identificativo {0}" +"
dall'insieme di dati.
Si è d'accordo?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 @@ -5008,5 +5173,5 @@ msgstr "Primitiva" -#: ../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 "" @@ -5149,5 +5314,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 "Applica" @@ -5254,7 +5419,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" @@ -5264,6 +5429,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" @@ -5298,7 +5463,5 @@ msgstr "Non ancora deciso" -#. --- 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 "Ruolo:" @@ -5328,6 +5491,6 @@ msgid "Enter a tag key, i.e. fixme" msgstr "" -"Inserire una chiave per l'etichetta, es. " -"fixme" +"Inserire una chiave per l'etichetta, es. fixme" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 @@ -5405,5 +5568,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 @@ -5445,6 +5608,5 @@ msgid "" "Set the selected elements on the map to the selected items in the list above." -msgstr "" -"Seleziona sulla mappa gli elementi selezionati nella lista qui sopra." +msgstr "Seleziona sulla mappa gli elementi selezionati nella lista qui sopra." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 @@ -5471,10 +5633,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 "" @@ -5549,18 +5710,18 @@ msgstr "Modalità filtro" -#: ../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 "Cronologia" -#: ../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 "Visualizza la cronologia di tutti gli oggetti selezionati." -#: ../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 "Oggetto con storico" -#: ../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 @@ -5570,13 +5731,13 @@ msgstr "Ricarica" -#: ../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 "Carica nuovamente tutti gli oggetti selezionati e aggiorna la lista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303 msgid "Show" msgstr "Visualizza" -#: ../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 "Visualizza lo storico degli oggetti selezionati." @@ -5769,5 +5930,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 "" @@ -5776,6 +5937,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 msgid "Set the current selection to the list of selected relations" -msgstr "" -"Imposta la selezione corrente con la lista delle relazioni selezionate" +msgstr "Imposta la selezione corrente con la lista delle relazioni selezionate" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451 @@ -5812,25 +5972,25 @@ msgstr "Zoom sulla selezione" -#: ../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 "Sel.: Rel.:{0}/Percorsi:{1}/Nodi:{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 "Selezione" -#: ../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 "Selezione: {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 "Stacca il pannello" -#: ../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." @@ -5839,5 +5999,5 @@ "degli strumenti a sinistra." -#: ../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 "Cliccare per minimizzare/massimizzare il contenuto del pannello" @@ -5903,5 +6063,5 @@ msgstr "N. di oggetti" -#: ../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 "" @@ -5909,33 +6069,33 @@ "correntemente selezionato." -#: ../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 "Scarica tutte le relazioni figlie (in modo ricorsivo)" -#: ../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 "Scarica tutti i figli" -#: ../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 "Scarica le relazioni selezionate" -#: ../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 "Scarica il figlio selezionato" -#: ../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 "Scarica i membri della relazione" -#: ../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 "Conflitto nei dati" -#: ../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 "" @@ -5946,17 +6106,18 @@ "essere caricata" -#: ../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 "La relazione è eliminata" -#: ../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 "Scaricamento della relazione {0}" -#: ../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}" @@ -5965,22 +6126,49 @@ "Eccezione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +#: ../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] "Scarica tutti i percorsi ed i nodi incompleti di questa relazione" +msgstr[1] "Scarica tutti i percorsi ed i nodi incompleti di questa relazione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Scarica i membri della relazione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "Scaricamento della relazione {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 msgid "Tags and Members" msgstr "Etichette e Membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Parent Relations" msgstr "Relazioni da cui dipende" -#: ../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 "Relazioni figlie" -#: ../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 "Applica Ruolo" + +#: ../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 "Inserire un ruolo per tutte le appartenenze alla relazione" + +#: ../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?" +"relation itself.
This creates circular dependencies and is discouraged." +"
How do you want to proceed with circular dependencies?" msgstr "" "C'è almeno un membro in questa relazione che si riferisce
alla " @@ -5989,19 +6177,19 @@ "circolari?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 msgid "Remove them, clean up relation" msgstr "Rimuovili, ripulisci la relazione" -#: ../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 "Ignorali, mantieni la relazione com'è" -#: ../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?" +"primitive ''{0}''

Do you really want to add another relation member?" msgstr "" "Questa relazione contiene già uno o più membri che si " @@ -6009,9 +6197,9 @@ "aggiungere un altro membro alla relazione?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 msgid "Multiple members referring to same primitive" msgstr "Più membri fanno riferimento alla stessa primitiva" -#: ../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 "" @@ -6024,5 +6212,5 @@ "''''{0}'''' omessa." -#: ../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" @@ -6031,5 +6219,5 @@ "del primo membro" -#: ../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" @@ -6038,5 +6226,5 @@ "l'ultimo membro" -#: ../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 " @@ -6046,5 +6234,5 @@ "del primo membro selezionato" -#: ../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 " @@ -6054,5 +6242,5 @@ "l'ultimo membro selezionato" -#: ../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 "" @@ -6060,10 +6248,10 @@ #. 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 "Editor delle relazioni: Rimuovi selezione" -#: ../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" @@ -6072,5 +6260,5 @@ "selezione corrente" -#: ../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 "" @@ -6081,62 +6269,65 @@ "selezione corrente" -#: ../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 "Seleziona le primitive per i membri della relazione selezionata" -#: ../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 "Ordina i membri della relazione" -#. 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 +msgid "Sort" +msgstr "Ordina" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 msgid "Relation Editor: Sort" msgstr "Editor delle relazioni: Ordina" -#: ../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 "Sposta in alto i membri attualmente selezionati" #. 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 "Editor delle relazioni: Sposta in alto" -#: ../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 "Sposta in basso i membri attualmente selezionati" #. 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 "Editor delle relazioni: Sposta in basso" -#: ../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 "Rimuovi i membri correntemente selezionati da questa relazione" #. 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 "Editor delle relazioni: Rimuovi" -#: ../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 "Elimina la relazione correntemente modificata" -#: ../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 "Si, crea un conflitto e chiudi" -#: ../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 "" "Cliccare per creare un conflitto e chiudere questo editor delle relazioni" -#: ../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 "No, continua la modifica" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../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" @@ -6145,5 +6336,5 @@ "modifica della relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6155,14 +6346,13 @@ "desidera creare un conflitto e chiudere l'editor?" -#: ../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 "Conflitto nei dati" -#: ../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." +#: ../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 "" "Il livello ''''{0}'''' contiene già un conflitto per la " @@ -6170,41 +6360,49 @@ "riprovare." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 msgid "Apply the current updates" msgstr "Applica gli aggiornamenti correnti" -#: ../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 "Applica gli aggiornamenti e chiudi la finestra" -#: ../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 "Annulla gli aggiornamenti e chiudi la finestra" -#: ../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 "Aggiungi una etichetta vuota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 -msgid "Download all incomplete ways and nodes in relation" -msgstr "Scarica tutti i percorsi ed i nodi incompleti di questa relazione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#, fuzzy +msgid "Download all incomplete members" +msgstr "Scarica i membri della relazione" + +#: ../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 "Scarica i membri" -#: ../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 "Editor delle relazioni: Scarica membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#, fuzzy +msgid "Download selected incomplete members" +msgstr "Scarica i membri della relazione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 msgid "Sets a role for the selected members" msgstr "Imposta un ruolo ai membri selezionati" -#: ../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 "Applica Ruolo" -#: ../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 "" @@ -6217,17 +6415,17 @@ "veramente applicare il nuovo ruolo?" -#: ../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 "Si, applica" -#: ../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 "No, non applicare" -#: ../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 "Conferma ruolo vuoto" -#: ../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 "" @@ -6235,26 +6433,19 @@ "correntemente selezionato." -#. 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 "Zoom a" -#: ../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 "" "Ingrandimento disabilitato perché il livello di questa relazione non è attivo" -#: ../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 "Ingrandimento disabilitato perché non c'è alcun membro selezionato" @@ -6296,19 +6487,19 @@ msgstr "Modifica la relazione correntemente selezionata" -#: ../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 "Applica cambiamenti" -#: ../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 "Crea una nuova relazione nel layer ''{0}''" -#: ../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 "Modifica la nuova relazione nel layer ''{0}''" -#: ../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}''" @@ -6320,6 +6511,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 "" "Attenzione: eccezione ignorata perché il lavoro è stato annullato. " @@ -6367,6 +6557,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" -msgstr "" -"Aggiungi un segnalibro per l'area di scarico correntemente selezionata" +msgstr "Aggiungi un segnalibro per l'area di scarico correntemente selezionata" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 @@ -6475,7 +6664,7 @@ "into the currently active data layer." msgstr "" -"Seleziona per scaricare i dati in un nuovo livello dei " -"dati.
Deselezionare per scaricare nel livello dei dati correntemente " -"attivo." +"Seleziona per scaricare i dati in un nuovo livello dei dati." +"
Deselezionare per scaricare nel livello dei dati correntemente attivo." #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:124 @@ -6517,11 +6706,10 @@ #, java-format msgid "" -"Neither {0} nor {1} is " -"enabled.
Please chose to either download OSM data, or GPX data, or " -"both." -msgstr "" -"Né {0} né {1} sono " -"abilitati.
Scegliere se scaricare i dati OSM, oppure i dati GPX, oppure " -"entrambi." +"Neither {0} nor {1} is enabled." +"
Please chose to either download OSM data, or GPX data, or both." +msgstr "" +"Né {0} né {1} sono abilitati." +"
Scegliere se scaricare i dati OSM, oppure i dati GPX, oppure entrambi." #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80 @@ -7293,5 +7481,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 @@ -7533,6 +7721,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 "" "

Manca il contenuto per questo argomento di " @@ -7549,6 +7737,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 "" "

Errore durante l''ottenimento delle " @@ -7563,7 +7751,7 @@ "network problem, please check your
your internet connection" msgstr "" -"Fallita l''apertura della pagina di aiuto per l''indirizzo url " -"{0}.
Tipicamente questo è dovuto a qualche problema di rete, controllare " -"la propria
connessione ad internet" +"Fallita l''apertura della pagina di aiuto per l''indirizzo url {0}." +"
Tipicamente questo è dovuto a qualche problema di rete, controllare la " +"propria
connessione ad internet" #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 @@ -7613,6 +7801,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " -msgstr "" -"Attenzione: posizione errata nel documento HTML. L'eccezione è stata: " +msgstr "Attenzione: posizione errata nel documento HTML. L'eccezione è stata: " #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 @@ -7837,14 +8024,14 @@ 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 "Informazioni sul gruppo di modifiche" -#: ../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 "" "Lancia il browser con le informazioni relative all''insieme di modifiche" -#: ../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}" @@ -7946,6 +8133,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 "" "Il livello ''''{0}'''' contiene delle modifiche che dovrebbero essere " @@ -7994,6 +8180,5 @@ #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" -msgstr "" -"Selezionare per caricare il livello ''''{0}'''' sul server ''''{1}''''" +msgstr "Selezionare per caricare il livello ''''{0}'''' sul server ''''{1}''''" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49 @@ -8040,6 +8225,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] "" "{0} livello ha la necessità di essere salvato ma non possiede alcun " @@ -8059,6 +8244,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 " @@ -8125,5 +8310,5 @@ msgstr "Preparazione del livello ''{0}'' per il caricamento ..." -#: ../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 " @@ -8133,5 +8318,5 @@ "modifiche
è stata annullata oppure è fallita." -#: ../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 "Caricamento e/o salvataggio incompleto" @@ -8204,41 +8389,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 "Carica" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 msgid "Settings" msgstr "Impostazioni" -#: ../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 "" -"Decidere come caricare i dati e quale insieme di modifiche utilizzare" - -#: ../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 +msgstr "Decidere come caricare i dati e quale insieme di modifiche utilizzare" + +#: ../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 "Etichette del nuovo insieme di modifiche" -#: ../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 "Applica le etichette ai dati dell'insieme di modifiche caricato" -#: ../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 "Oggetti da aggiungere:" -#: ../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 "Oggetti da modificare:" -#: ../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 "Oggetti da eliminare:" -#: ../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:" @@ -8247,5 +8431,5 @@ msgstr[1] "{0} oggetti da aggiungere:" -#: ../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:" @@ -8254,5 +8438,5 @@ msgstr[1] "{0} oggetti da modificare:" -#: ../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:" @@ -8261,74 +8445,70 @@ msgstr[1] "{0} oggetti da eliminare:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 msgid "Upload Changes" msgstr "Carica le modifiche" -#: ../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 "Carica le primitive modificate" -#: ../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 "" "Inserire un commento per questo insieme di modifiche (min. 3 caratteri)" -#: ../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 "Commento non valido" -#: ../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 "Per prima cosa inserisci le coordinate della località." + +#: ../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 "Annulla il caricamento e ritorna alle modifiche" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 -msgid "Upload all changes in one request" -msgstr "Carica tutte le modifiche in una sola richiesta" - -#: ../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 "" -"Abilitare per caricare tutte le modifiche in una sola richiesta, " -"disabilitare per utilizzare una richiesta per ogni singola primitiva " -"modificata" - -#: ../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 "Crea un breve commento ai cambiamenti che sta caricando:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 msgid "Enter an upload comment (min. 3 characters)" msgstr "Inserire un commento al caricamento (min. 3 caratteri)" -#: ../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 "Apri un nuovo insieme di modifiche" -#: ../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 "" "Apri un nuovo insieme di modifiche ed utilizzalo al prossimo caricamento" -#: ../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 "Utilizza un insieme di modifiche aperto" -#: ../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 "Carica i dati su un insieme di modifiche già aperto" -#: ../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 "Chiudi l'insieme di modifiche dopo il caricamento" -#: ../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 "" "Selezionare per chiudere l'insieme di modifiche dopo il prossimo caricamento" -#: ../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}" @@ -8336,17 +8516,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 "" -"Carica dal server la lista degli insiemi di modifiche personali aperti" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 +msgstr "Carica dal server la lista degli insiemi di modifiche personali aperti" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054 msgid "Close the currently selected open changeset" msgstr "Chiudi l'insieme di modifiche aperto correntemente selezionato" -#: ../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}." @@ -8354,6 +8533,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 "" @@ -8364,5 +8543,5 @@ "questa primitiva e riprovare a caricare." -#: ../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 "Preparazione delle primitive da caricare ..." @@ -8396,111 +8575,58 @@ msgstr "Continua il caricamento" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Immagini per {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "Leggi GPX..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Informazioni di tempo non disponibili per il punto {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 "Impossibile leggere il tempo \"{0}\" per il punto {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 "Lettura di {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Non è stata trovata nessuna immagine con una data leggibile." - -#: ../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 "Immagini geoetichettate" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "GPS inizio: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "GPS fine: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "differenza attuale: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "differenza fuso orario: " - -#: ../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] "immagine" -msgstr[1] "immagini" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} in questa traccia." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Sincronizza tempo" - -#: ../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 "Immagini JPEG (*.jpeg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "Impossibile leggere la data nel file \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "Orario non presente nei dati EXIF del file \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Immagine" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "Fuso orario del GPS (differenza rispetto alle foto)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Sincronizza l'orario con l'unità GPS" - -#: ../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 "Impossibile decodificare l'orario inserito." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, fuzzy, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "Attenzione: è fallita la persistenza delle preferenze su ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 +#, fuzzy +msgid "Upload data in one request" +msgstr "Carica tutte le modifiche in una sola richiesta" + +#: ../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 +#, fuzzy +msgid "(1 request)" +msgstr "Richiesta errata" + +#: ../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} metri" +msgstr[1] "{0} metri" + +#: ../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 "Inserire una stringa di filtro." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 +#, fuzzy, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" +"Il file ''''{0}'''' non è scrivibile. Specificare un altro nome di file." + +#: ../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 @@ -8508,30 +8634,30 @@ msgstr "punto 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 "Personalizza disegno linee" -#: ../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 "Usa le impostazioni globali." -#: ../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 "Disegna le linee tra i punti di questo livello." -#: ../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 "Non disegnare le linee tra i punti di questo livello." -#: ../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 "Seleziona le opzioni per il disegno delle linee" -#: ../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 @@ -8539,5 +8665,5 @@ msgstr "Personalizza colori" -#: ../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 @@ -8546,5 +8672,5 @@ msgstr "Predefinito" -#: ../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 @@ -8553,58 +8679,63 @@ msgstr "Scegli un colore" -#: ../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 "Crea marcatori dai punti con nome" -#: ../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 "Nomina i punti del percorso da {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215 msgid "Import Audio" msgstr "Importa l'audio" -#: ../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 "Files audio Wave (*.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 "Marcatori audio da {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 "Importa immagini" -#: ../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 "Immagini JPEG (*.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 "Nome: {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 @@ -8612,5 +8743,5 @@ msgstr "Descrizione: {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" @@ -8620,5 +8751,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 @@ -8626,22 +8757,17 @@ msgstr "Descrizione" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 msgid "Timespan" msgstr "Differenza temporale" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 msgid "Length" msgstr "Lunghezza" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 -msgid "URL" -msgstr "Indirizzo URL" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443 msgid "Length: " msgstr "Lunghezza: " -#: ../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, " @@ -8650,5 +8776,5 @@ msgstr[1] "{0} percorsi, " -#: ../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" @@ -8657,13 +8783,13 @@ msgstr[1] "{0} punti del percorso" -#: ../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 "Converti in livello dati" -#: ../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:" +#: ../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 "" "Il caricamento di dati GPS non elaborati assunti come dati " @@ -8671,11 +8797,11 @@ "tracciati, vedere qui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8685,29 +8811,29 @@ msgstr "Convertito da: {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 "Scarica da OSM lungo questo tracciato" -#: ../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 "Scarica tutto entro:" -#: ../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} metri" -#: ../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 "Area massima per richiesta:" -#: ../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} km quadrati" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8718,9 +8844,9 @@ "vuole procedere?" -#: ../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 "Nessuna traccia GPX da associare con l'audio." -#: ../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 " @@ -8731,5 +8857,5 @@ "all'inizio." -#: ../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 " @@ -8739,19 +8865,19 @@ "tracciato per poter essere giustamente calcolati." -#: ../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 "Livello dati {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 "al di fuori dell'area scaricata" -#: ../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 "versione {0}" -#: ../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 "" @@ -8759,5 +8885,5 @@ "nella versione 0.5" -#: ../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." @@ -8766,5 +8892,5 @@ msgstr[1] "Sono stati individuati {0} conflitti." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 #, java-format msgid "" @@ -8784,5 +8910,5 @@ "server." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 #, java-format msgid "" @@ -8799,11 +8925,11 @@ "conflitti e risolverli manualmente." -#: ../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 "Cliccare per chiudere questa finestra e continuare a modificare" -#: ../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" @@ -8812,32 +8938,32 @@ msgstr[1] "{0} eliminati" -#: ../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} è composto da:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 msgid "unset" msgstr "disattiva" -#: ../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 "Versione delle API: {0}" -#: ../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 "Converti in un layer GPX" -#: ../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 "" @@ -8845,6 +8971,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 "" "Il caricamento di dati GPS non elaborati assunti come dati " @@ -8886,4 +9012,362 @@ msgstr[1] "{0} punti" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "File GPX (*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "Il file {0} è stato caricato già sotto il nome \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#, java-format +msgid "Error while parsing {0}" +msgstr "Impossibile interpretare {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Impossibile leggere \"{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 "" +"Fotografa il tuo ricevitore GPS mentre indica l'ora.
Visualizza qui " +"la foto.
Copia l'ora dalla foto e seleziona la fascia oraria
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Ora di scatto della fotografia (dai dati exif):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "Ora GPS (letto dalla fotografia precedente): " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [gg/mm/aaaa hh:mm:ss]" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +msgid "I'm in the timezone of: " +msgstr "Mi trovo nel fuso orario di: " + +#: ../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 "Nessuna data" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "Apri un'altra fotografia" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +msgid "Synchronize time from a photo of the GPS receiver" +msgstr "Sincronizza l'ora da una fotografia del ricevitore GPS" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"Errore nell'interpretazione della data.\n" +"Si prega di usare il formato richiesto" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "Data non valida" + +#: ../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 "Tracciato GPX: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Apri un altro tracciato GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +msgid "Timezone: " +msgstr "Fuso orario: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +msgid "Offset:" +msgstr "Scostamento:" + +#: ../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 "" +"Posso fare una fotografia al mio ricevitore GPS.
Può questo essere " +"di aiuto?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 +msgid "Update position for: " +msgstr "Aggiorna la posizione per: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 +msgid "All images" +msgstr "Tutte le immagini" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 +msgid "Images with no exif position" +msgstr "Immagini senza posizione exif" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 +msgid "Not yet tagged images" +msgstr "Immagini ancora senza etichetta" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +msgid "Correlate images with GPX track" +msgstr "Correla le immagini al tracciato GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Correlate" +msgstr "Correla" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Auto-Guess" +msgstr "Auto-determina" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +msgid "You should select a GPX track" +msgstr "Selezionare un tracciato GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "Nessun tracciato GPX selezionato" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Errore nella interpretazione del fuso orario.\n" +"Formato atteso: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +msgid "Invalid timezone" +msgstr "Fuso orario non valido" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Errore durante l'analisi dell'offset.\n" +"Formato atteso: {0}." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +msgid "Invalid offset" +msgstr "Compensazione non valida" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "Trovate {0} corrispondenze {1} nel tracciato GPX {2}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "Tracciato GPS caricato" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 +msgid "The selected photos don't contain time information." +msgstr "Le foto selezionate non contengono informazioni sull'ora." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 +msgid "Photos don't contain time information" +msgstr "Le foto non contengono informazioni sull'ora" + +#: ../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 "" +"Il tracciato GPX selezionato non contiene le marcature temporali. " +"Selezionarne un altro." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "Il tracciato GPX non contiene alcuna informazione sull'ora" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "Fuso orario: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "Minuti: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "Secondi: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Correlate {0} su {1} foto al tracciato GPX." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "(Differenza di orario pari a {0} giorni)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "Differenza tra il tracciato e le foto: {0}m {1}s" + +#: ../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 "" +"E' stato generato un errore durante il tentativo di correlare le foto con il " +"tracciato GPX. Si possono regolare le barre di scorrimento per correlare " +"manualmente le foto." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 +msgid "Matching photos to track failed" +msgstr "E' fallita la correlazione delle foto al tracciato" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +msgid "Adjust timezone and offset" +msgstr "Regola fuso orario e differenza" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +msgid "Default Values" +msgstr "Valori predefiniti" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +msgid "Extracting GPS locations from EXIF" +msgstr "Estrazione delle localizzazioni GPS dagli EXIF" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +msgid "Starting directory scan" +msgstr "Inizio analisi cartella" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +msgid "One of the selected files was null" +msgstr "Uno dei file selezionati era nullo" + +#: ../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 "Lettura delle foto ..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "Lettura di {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 "Non è possibile ottenere il percorso canonico per la cartella {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "Analisi cartella {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "Trovato un file nullo nella cartella {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Errore durante il prelevamento dei file dalla cartella {0}\n" + +#: ../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 "Immagini geoetichettate" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "Correlazione ai dati GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "immagine" +msgstr[1] "immagini" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "{0} sono stati trovati etichettati dal gps" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +msgid "No image" +msgstr "Nessuna immagine" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "Caricamento {0}" + +#: ../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 "Errore nel file {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Visualizza le foto geo-referenziate" + +#: ../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 "Precedente" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Rimuovi la fotografia dal layer" + +#: ../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 "Successivo" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "Centra la visualizzazione" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +msgid "Zoom best fit and 1:1" +msgstr "Zoom ottimale e 1:1" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#, java-format +msgid "" +"\n" +"Altitude: {0} m" +msgstr "" +"\n" +"Altitudine: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -9210,5 +9694,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 @@ -9411,6 +9895,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 "" "Disegna le frecce di direzione usando riferimenti tabellari piuttosto che " @@ -9479,6 +9962,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 "" "Applicando l'antialiasing alla mappa, la visualizzazione risulterà migliore." @@ -9550,19 +10032,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 "Aspetto e stile" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Lingua" + +#: ../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 "Predefinita (determinata automaticamente)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Lingua" - -#: ../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 @@ -9828,6 +10310,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 "" "Fallito il caricamento della lista dei sorgenti degli stili " @@ -9896,6 +10378,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 "" "

Inoltre le scorciatoie sono abilitate quando sono assegnate a una voce di " @@ -9913,9 +10395,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 "" "

Si può notare che nella lista di selezione dei tasti nella prossima " @@ -9958,6 +10439,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 "" "

Lo pseudo-modificatore 'disabled' disabiliterà il collegamento quando " @@ -10052,5 +10533,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 "Ulteriori informazioni su questa caratteristica" @@ -10137,5 +10618,5 @@ msgstr "Scaricamento dei punti da {0} a {1} in corso..." -#: ../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 @@ -10143,5 +10624,5 @@ msgstr "Fallita l''analisi della data ''{0}'' restituita dal server." -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -10264,16 +10745,15 @@ msgstr "Modalità {0} sconosciuta." -#: ../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." +#: ../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 "" "Nessuna primitiva con {0} nell''insieme di dati locale. Non è possibile " "dedurre il tipo di primitiva." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../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 @@ -10302,20 +10782,20 @@ "Il server ha risposto con il codice 404 per l''identificativo {0}. Saltato." -#: ../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 "Prelevamento di un insieme di nodi da ''''{0}''''" -#: ../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 "Prelevamento di un insieme di percorsi da ''''{0}''''" -#: ../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 "Prelevamento di un insieme di relazioni da ''''{0}''''" -#: ../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 " @@ -10324,4 +10804,11 @@ "Il server ha risposto con il codice 404, ritento con una richiesta per ogni " "singola primitiva" + +#: ../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] "Scaricamento dei punti da {0} a {1} in corso..." +msgstr[1] "Scaricamento dei punti da {0} a {1} in corso..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10363,18 +10850,18 @@ msgstr "preferenza ''{0}'' mancante. Impossibile inizializzare OsmApi" -#: ../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 "Questa versione di JOSM non è compatibile con il configurato." -#: ../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}." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#, fuzzy, java-format +msgid "" +"It supports protocol version 0.6, while the server says it supports {0} to " +"{1}." msgstr "" "Supporta le versioni 0.5 e 0.6 del protocollo, mentre il server dice di " "supportare le versione da {0} a {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 #, java-format msgid "Communications with {0} established using protocol version {1}." @@ -10383,12 +10870,11 @@ "protocollo" -#: ../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 "" -"Formato di ID non atteso restituito dal server. Ottenuto ''''{0}''''." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279 +msgstr "Formato di ID non atteso restituito dal server. Ottenuto ''''{0}''''." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 #, java-format msgid "" @@ -10398,63 +10884,63 @@ "''''{0}''''. Ottenuto ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 msgid "Creating changeset..." msgstr "Creazione dell'insieme di modifiche..." -#: ../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 "Insieme di modifiche {0} aperto con successo" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 msgid "Updating changeset..." msgstr "Aggiornamento dell'insieme di modifiche..." -#: ../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 "Aggiornamento dell''insieme di modifiche {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 msgid "Closing changeset..." msgstr "Chiusura del gruppo di modifiche..." -#: ../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 "" "Non è presente alcun gruppo di modifiche per il caricamento differenziale" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "Preparing..." msgstr "Preparazione in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Invio in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Waiting 10 seconds ... " msgstr "Attesa di 10 secondi ... " -#: ../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 "Inizio del ripristino {0} di {1} in {2} secondi ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 msgid "OK - trying again." msgstr "OK - nuovo tentativo." -#: ../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 "Inizio del ripristino {0} di {1}." -#: ../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 "" "L'insieme di modifiche corrente è nullo. Non si possono caricare i dati." -#: ../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}." @@ -10463,5 +10949,5 @@ "{0}." -#: ../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}." @@ -10498,5 +10984,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}''." @@ -10510,6 +10996,5 @@ #, java-format msgid "Illegal value for attribute ''{0}''. Got ''{1}''." -msgstr "" -"Valore non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''." +msgstr "Valore non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''." #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81 @@ -10528,5 +11013,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}." @@ -10534,5 +11019,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}" @@ -10547,5 +11032,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}''." @@ -10605,12 +11090,12 @@ #: ../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 "" "ATTENZIONE: La password viene memorizzata in chiaro nel file di " "configurazione.
La password è trasmessa in chiaro al server, codificata " -"all'interno dell'indirizzo URL.
Non usare una password " -"importante." +"all'interno dell'indirizzo URL.
Non usare una password importante." #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 @@ -10633,12 +11118,12 @@ msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -"E'' stato generato un errore durante il salvataggio.
L''errore " -"è:
{0}" +"E'' stato generato un errore durante il salvataggio.
L''errore è:" +"
{0}" #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98 #, java-format msgid "" -"An error occurred while restoring backup file.
Error " -"is:
{0}" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "" "E'' stato generato un errore durante il ripristino del file della " @@ -10648,6 +11133,5 @@ #, java-format msgid "Could not back up file. Exception is: {0}" -msgstr "" -"Impossibile fare una copia di sicurezza del file. L''eccezione è: {0}" +msgstr "Impossibile fare una copia di sicurezza del file. L''eccezione è: {0}" #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17 @@ -10717,14 +11201,14 @@ msgstr "il file \"{0}\" non esiste" -#: ../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}''." +#: ../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 "" "Attributi obbligatori mancanti sull''elemento ''''bounds''''. Ottenuto " "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Found XML element not as direct child of element ." msgstr "" @@ -10732,11 +11216,10 @@ "." -#: ../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 "" -"Attributo obbligatorio ''''{0}'''' mancante su del percorso {1}." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 +msgstr "Attributo obbligatorio ''''{0}'''' mancante su del percorso {1}." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." @@ -10745,5 +11228,5 @@ "{0}." -#: ../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 "" @@ -10751,23 +11234,22 @@ "dell'elemento ." -#: ../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 "Attributo ''''ref'''' mancante sul membro nella relazione {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 -#, java-format -msgid "" -"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" +#: ../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 "" "Valore non valido per l''attributo ''''ref'''' sul membro nella relazione " "{0}. Ottenuto {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Attributo ''''tipo'''' mancante sul membro {0} nella relazione {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 #, java-format msgid "" @@ -10777,9 +11259,9 @@ "relazione {1}. Ottenuto {2}." -#: ../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 " incompleto, specificazione con ref=0" -#: ../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." @@ -10788,10 +11270,10 @@ "ingresso. Omesso." -#: ../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 "Oggetto illegale con 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 "" @@ -10803,8 +11285,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 "" @@ -10816,20 +11298,20 @@ #. 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 "Versione delle API sconosciuta o non supportata. Ottenuto {0}." -#: ../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 "Attributo ''''versione'''' mancante sulla primitiva OSM con ID {0}." -#: ../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 "Manca l''attributo obbligatorio ''''{0}''''." -#: ../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}''." @@ -10837,5 +11319,5 @@ "Valore lungo non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 #, java-format msgid "" @@ -10845,5 +11327,5 @@ "esterno ''''{1}''''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10854,5 +11336,5 @@ "almeno un nodo nei dati caricati." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10862,5 +11344,5 @@ "esterno ''''{1}''''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10871,13 +11353,13 @@ "con ID esterno ''''{1}''''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:554 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 msgid "Prepare OSM data..." msgstr "Preparazione dati OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 msgid "Parsing OSM data..." msgstr "Analisi dei dati OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 msgid "Preparing data set..." msgstr "Preparazione dell'insieme di dati..." @@ -10930,4 +11412,10 @@ msgid "Contacting Server..." msgstr "Connessione al server in corso..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 +#, fuzzy, java-format +msgid "Expected value > 0 for parameter ''{0}'', got {1}" +msgstr "valore inaspettato per il parametro \"index\". Ottenuto {0}" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10971,14 +11459,14 @@ "''''{1}''''. Ottenuto {2}." -#: ../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 "Inizio del caricamento con una richiesta per primitiva ..." -#: ../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 "{0}% ({1}/{2}), {3} mancanti. Caricamento nodo ''''{4}'''' (id: {5})" -#: ../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})" @@ -10986,5 +11474,5 @@ "{0}% ({1}/{2}), {3} mancanti. Caricamento percorso ''''{4}'''' (id: {5})" -#: ../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})" @@ -10992,30 +11480,26 @@ "{0}% ({1}/{2}), {3} mancanti. Caricamento relazione ''''{4}'''' (id: {5})" -#: ../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 "Inizio del caricamento in una richiesta ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#, fuzzy, java-format +msgid "Value >0 expected for parameter ''{0}'', got {1}" +msgstr "valore inaspettato per il parametro \"index\". Ottenuto {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 +#, fuzzy +msgid "Starting to upload in chunks..." +msgstr "Inizio del caricamento in una richiesta ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#, fuzzy, java-format +msgid "({0}/{1}) Uploading {2} objects..." +msgstr "Caricamento di {0} oggetti ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "Caricamento dati ..." - -#: ../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 "" -"ATTENZIONE: non è definita alcuna versione delle API per i dati da caricare. " -"Ritorno alla versione 0.6" - -#: ../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 "" -"ATTENZIONE: la preferenza ''''{0}'''' o la versione delle API ''''{1}'''' " -"dell''insieme dei dati richiedono l''utilizzo dei caricamenti differenziali, " -"ma le API non sono in grado di gestirli. Ignorato il caricamento " -"differenziale." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11056,17 +11540,27 @@ msgstr "Scaricamento estensione {0}..." -#: ../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 "Cancella {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Errore nell'eliminazione del file dell'estensione: {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 msgid "Skip download" msgstr "Salta il download" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Download Plugin" msgstr "Scarica estensione" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Skip Download" msgstr "Salta scaricamento" -#: ../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}." @@ -11078,25 +11572,21 @@ msgstr "E' stato generato un errore dall'estensione {0}" -#: ../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 "" -"E'' stato richiesto il caricamento dell''estensione {0}. Questa estensione " -"non è più necessaria." - -#: ../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?" +"developed and very likely will produce errors.
It should be disabled." +"
Delete from preferences?" msgstr "" "E'' stato richiesto il caricamento dell''estensione {0}.
Questa " -"estensione non è più mantenuta e molto probabilmente produrrà degli " -"errori.
Dovrebbe essere disabilitata.
Rimuovere dalle " -"preferenze?" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +"estensione non è più mantenuta e molto probabilmente produrrà degli errori." +"
Dovrebbe essere disabilitata.
Rimuovere dalle preferenze?" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 msgid "" "You updated your JOSM software.\n" @@ -11109,5 +11599,5 @@ "Aggiornare le estensioni adesso?" -#: ../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." @@ -11116,20 +11606,19 @@ "giorni fa." -#: ../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 "Aggiorna estensioni" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 msgid "Skip update" msgstr "Salta aggiornamento" -#: ../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 "" -"L''estensione {0} richiede l''aggiornamento alla versione {1} di JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166 +msgstr "L''estensione {0} richiede l''aggiornamento alla versione {1} di JOSM." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." @@ -11137,27 +11626,26 @@ "L''estensione {0} è richiesta dall''estensione {1}, ma non è stata trovata." -#: ../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 "Estensione non trovata: {0}." -#: ../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 "" -"Non è possibile caricare il plugin {0}. Cancellarlo dalle preferenze?" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220 +msgstr "Non è possibile caricare il plugin {0}. Cancellarlo dalle preferenze?" + #: ../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 "Disabilita estensione" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Keep plugin" msgstr "Mantieni estensione" -#: ../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 " @@ -11167,9 +11655,9 @@ "i permessi per sovrascrivere quelle esistenti." -#: ../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 "" @@ -11179,10 +11667,10 @@ "dall'estensione ''{0}''." -#: ../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 "Secondo le informazioni all'interno del plugin l'autore è {0}." -#: ../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." @@ -11191,9 +11679,9 @@ "comunicare un bug." -#: ../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 "Disabilitare l'estensione?" -#: ../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 " @@ -11203,14 +11691,14 @@ "eliminare l'estensione." -#: ../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 "" "L''estensione non può essere rimossa. Probabilmente è stata già disabilitata" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:386 msgid "Plugin information" msgstr "Informazioni sull''estensione" -#: ../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" @@ -11235,6 +11723,5 @@ #, java-format msgid "Plug-in named {0} is not available. Update skipped." -msgstr "" -"L''estensione con nome {0} non è disponibile. Aggiornamento ignorato." +msgstr "L''estensione con nome {0} non è disponibile. Aggiornamento ignorato." #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109 @@ -11280,6 +11767,5 @@ #, java-format msgid "Error reading plugin information file: {0}" -msgstr "" -"Impossibile leggere il file con le informazioni sulle estensioni: {0}" +msgstr "Impossibile leggere il file con le informazioni sulle estensioni: {0}" #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:301 @@ -11332,6 +11818,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 "" @@ -11356,7 +11842,7 @@ "the server URL in your preferences and your internet connection." msgstr "" -"Fallita l''inizializzazione della comunicazione con il server OSM " -"{0}.
Controllare l''indirizzo URL del server nelle proprie preferenze e " -"la propria connessione ad internet." +"Fallita l''inizializzazione della comunicazione con il server OSM {0}." +"
Controllare l''indirizzo URL del server nelle proprie preferenze e la " +"propria connessione ad internet." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 @@ -11367,8 +11853,7 @@ "reference to relation {0}, and upload again." msgstr "" -"Fallita l'eliminazione della relazione " -"{0}. E' ancora collegata alla relazione {1}.
Caricare la " -"relazione {1}, rimuovere il riferimento alla relazione {0}, e " -"riprovare." +"Fallita l'eliminazione della relazione {0}. E' ancora collegata alla relazione {1}.
Caricare la relazione " +"{1}, rimuovere il riferimento alla relazione {0}, e riprovare." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 @@ -11376,6 +11861,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 "" "Upload failed verso il server poiché il dataset " @@ -11388,6 +11873,6 @@ "already been closed." msgstr "" -"Fallita la chiusura dell''insieme di modifiche " -"{0}
perché è stato già chiuso." +"Fallita la chiusura dell''insieme di modifiche {0}
perché è stato già chiuso." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 @@ -11397,6 +11882,6 @@ "already been closed on {1}." msgstr "" -"Fallita la chiusura dell''insieme di modifiche " -"{0}
perché è stato già chiuso il {1}." +"Fallita la chiusura dell''insieme di modifiche {0}
perché è stato già chiuso il {1}." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 @@ -11438,7 +11923,6 @@ "check your internet connection." msgstr "" -"Fallita l''apertura della connessione al server " -"remoto
''''{0}''''.
Controllare la propria connessione ad " -"internet." +"Fallita l''apertura della connessione al server remoto
''''{0}''''." +"
Controllare la propria connessione ad internet." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 @@ -11449,29 +11933,27 @@ msgstr "" "Fallito il caricamento o lo scaricamento dei dati " -"da
''''{0}''''
a causa di un problema con il loro " -"trasferimento.
Dettagli (non tradotti): {1}" +"da
''''{0}''''
a causa di un problema con il loro trasferimento." +"
Dettagli (non tradotti): {1}" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, 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 "" "Il server OSM
''''{0}''''
ha riportato un errore interno al " -"server.
Solitamente questo è un problema temporaneo. Riprovare più " -"tardi." +"server.
Solitamente questo è un problema temporaneo. Riprovare più tardi." +"" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" -msgstr "" -"Il server OSM ''''{0}'''' ha riportato una richiesta non corretta.
" +msgstr "Il server OSM ''''{0}'''' ha riportato una richiesta non corretta.
" #: ../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 "" "La zona che si è tentato di scaricare è troppo estesa oppure la propria " @@ -11506,8 +11988,8 @@ "preferences and your internet connection." msgstr "" -"Fallita l''apertura della connessione al server " -"remoto
''''{0}''''.
Il nome dell''host ''''{1}'''' non può essere " -"risolto.
Controllare l''indirizzo URL delle API nelle proprie preferenze " -"e la propria connessione ad internet." +"Fallita l''apertura della connessione al server remoto
''''{0}''''." +"
Il nome dell''host ''''{1}'''' non può essere risolto.
Controllare " +"l''indirizzo URL delle API nelle proprie preferenze e la propria connessione " +"ad internet." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 @@ -11516,12 +11998,12 @@ "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 "" "Il server segnala che un oggetto è stato eliminato.
Il " "caricamento è fallito se si è tentato di aggiornare o eliminare " "questo oggetto.
Lo scaricamento è fallito se si è " -"tentato di scaricare questo oggetto.

Il messaggio d''errore " -"è:
{0}" +"tentato di scaricare questo oggetto.

Il messaggio d''errore è:
{0}" +"" #: ../core/src/org/openstreetmap/josm/tools/I18n.java:98 @@ -11580,6 +12062,6 @@ "\n" msgstr "" -"L''impostazione della scorciatoia da tastiera ''{0}'' per l''azione ''{1}'' " -"({2}) è fallita\n" +"L''impostazione della scorciatoia da tastiera ''{0}'' per l''azione " +"''{1}'' ({2}) è fallita\n" "perché la scorciatoia è già impegnata dall''azione ''{3}'' ({4}).\n" "\n" @@ -11604,6 +12086,5 @@ #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 msgid "(Hint: You can edit the shortcuts in the preferences.)" -msgstr "" -"(Suggerimento: Si possono modificare le scorciatoie nelle preferenze.)" +msgstr "(Suggerimento: Si possono modificare le scorciatoie nelle preferenze.)" #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:56 @@ -11775,6 +12256,5 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 msgid "Upload failed. Server returned the following message: " -msgstr "" -"Caricamento fallito. Il server ha risposto con il seguente messaggio: " +msgstr "Caricamento fallito. Il server ha risposto con il seguente messaggio: " #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346 @@ -11812,5 +12292,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" @@ -11825,12 +12305,10 @@ msgstr "Definisci un'interpolazione di indirizzo" -#. 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 "Dispari" -#: ../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 @@ -11838,59 +12316,94 @@ msgstr "Pari" -#: ../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 "Alfabetico" -#: ../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 "Numero" + +#. 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 "elemento naturale" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "luogo" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Noleggio" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 #, java-format msgid "Relation: {0}" msgstr "Relazione: {0}" -#: ../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 "Associa alla strada utilizzando:" -#: ../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 "Schema della numerazione:" -#: ../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 "segmento interno" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 msgid "Starting #:" msgstr "# iniziale:" -#: ../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 "# finale:" -#: ../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 "Assocerà {0} nodi supplementari per la numerazione degli edifici" -#: ../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 "Città:" -#: ../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 "Stato:" -#: ../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 "Codice postale:" -#: ../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 "Nazione:" -#: ../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 "Indirizzo completo:" -#: ../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 "Informazioni aggiuntive:" -#: ../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 "" @@ -11898,30 +12411,35 @@ "indirizzi" -#: ../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 "" "Selezionare un percorso di interpolazione degli indirizzi per questa strada" -#: ../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 "Erano attesi numeri dispari per gli indirizzi" -#: ../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 "Erano attesi numeri pari per gli indirizzi" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093 +#, fuzzy +msgid "Expected valid number for address increment" +msgstr "Erano attesi numeri dispari per gli indirizzi" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 msgid "Country code must be 2 letters" msgstr "Il codice della nazione deve essere composto da 2 lettere" -#: ../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 "Inserire un numero valido per l'indirizzo iniziale e finale" -#: ../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 "Un indirizzo alfabetico deve terminare con una lettera" -#: ../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 "" @@ -11929,376 +12447,19 @@ "alfabetici" -#: ../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 "" -"La lettera iniziale dell'indirizzo deve essere minore di quella finale" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946 +msgstr "La lettera iniziale dell'indirizzo deve essere minore di quella finale" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1333 msgid "Please enter valid number for starting address" msgstr "Inserire un numero valido per l'indirizzo iniziale" -#: ../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 "Inserire un numero valido per l'indirizzo finale" -#: ../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 "" -"Il numero iniziale dell'indirizzo deve essere minore di quello finale" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "AgPifoJ - Geotagged pictures" -msgstr "AgPifoJ - fotografie con geotag" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "Visualizza le foto geo-referenziate" - -#: ../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 "Precedente" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Rimuovi la fotografia dal layer" - -#: ../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 "Successivo" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "Centra la visualizzazione" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102 -msgid "Zoom best fit and 1:1" -msgstr "Zoom ottimale e 1:1" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 -#, java-format -msgid "" -"\n" -"Altitude: {0} m" -msgstr "" -"\n" -"Altitudine: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/h" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "Estrazione delle localizzazioni GPS dagli EXIF" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121 -msgid "Starting directory scan" -msgstr "Inizio analisi cartella" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:126 -msgid "One of the selected files was null" -msgstr "Uno dei file selezionati era nullo" - -#: ../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 "Lettura delle foto ..." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:186 -#, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "Non è possibile ottenere il percorso canonico per la cartella {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "Analisi cartella {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "Trovato un file nullo nella cartella {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Errore durante il prelevamento dei file dalla cartella {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "Correlazione ai dati GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} sono stati trovati etichettati dal gps" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "Apri immagini con AgPifoJ..." - -#: ../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 "Carica le immagini come un nuovo layer." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "File GPX (*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "Il file {0} è stato caricato già sotto il nome \"{1}\"" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#, java-format -msgid "Error while parsing {0}" -msgstr "Impossibile interpretare {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Impossibile leggere \"{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 "" -"Fotografa il tuo ricevitore GPS mentre indica l'ora.
Visualizza qui " -"la foto.
Copia l'ora dalla foto e seleziona la fascia oraria
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Ora di scatto della fotografia (dai dati exif):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "Ora GPS (letto dalla fotografia precedente): " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [gg/mm/aaaa hh:mm:ss]" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 -msgid "I'm in the timezone of: " -msgstr "Mi trovo nel fuso orario di: " - -#: ../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 "Nessuna data" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "Apri un'altra fotografia" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 -msgid "Synchronize time from a photo of the GPS receiver" -msgstr "Sincronizza l'ora da una fotografia del ricevitore GPS" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"Errore nell'interpretazione della data.\n" -"Si prega di usare il formato richiesto" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "Data non valida" - -#: ../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 "Tracciato GPX: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Apri un altro tracciato GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -msgid "Timezone: " -msgstr "Fuso orario: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 -msgid "Offset:" -msgstr "Scostamento:" - -#: ../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 "" -"Posso fare una fotografia al mio ricevitore GPS.
Può questo essere " -"di aiuto?" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Aggiorna la posizione per: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Tutte le immagini" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Immagini senza posizione exif" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Immagini ancora senza etichetta" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 -msgid "Correlate images with GPX track" -msgstr "Correla le immagini al tracciato GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Correlate" -msgstr "Correla" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Auto-determina" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "Selezionare un tracciato GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Nessun tracciato GPX selezionato" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Errore nella interpretazione del fuso orario.\n" -"Formato atteso: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Fuso orario non valido" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Errore durante l'analisi dell'offset.\n" -"Formato atteso: {0}." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Compensazione non valida" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Trovate {0} corrispondenze {1} nel tracciato GPX {2}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "Tracciato GPS caricato" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "Le foto selezionate non contengono informazioni sull'ora." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Le foto non contengono informazioni sull'ora" - -#: ../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 "" -"Il tracciato GPX selezionato non contiene le marcature temporali. " -"Selezionarne un altro." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "Il tracciato GPX non contiene alcuna informazione sull'ora" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Fuso orario: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minuti: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Secondi: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Correlate {0} su {1} foto al tracciato GPX." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Differenza di orario pari a {0} giorni)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Differenza tra il tracciato e le foto: {0}m {1}s" - -#: ../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 "" -"E' stato generato un errore durante il tentativo di correlare le foto con il " -"tracciato GPX. Si possono regolare le barre di scorrimento per correlare " -"manualmente le foto." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "E' fallita la correlazione delle foto al tracciato" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Regola fuso orario e differenza" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Valori predefiniti" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433 -msgid "No image" -msgstr "Nessuna immagine" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "Caricamento {0}" - -#: ../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 "Errore nel file {0}" +msgstr "Il numero iniziale dell'indirizzo deve essere minore di quello finale" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -12453,20 +12614,17 @@ #: ../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." -msgstr "" -"Un gestore speciale del wms francese del catasto all'indirizzo " -"www.cadastre.gouv.fr

Leggere i Termini e Condizioni d'Uso qui (in " -"francese):
" -"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " -"
prima di effettuare qualsiasi caricamento di dati creati da questa " -"estensione." +"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 "" +"Un gestore speciale del wms francese del catasto all'indirizzo www.cadastre." +"gouv.fr

Leggere i Termini e Condizioni d'Uso qui (in francese): " +"
http://www.cadastre.gouv.fr/scpc/html/" +"CU_01_ConditionsGenerales_fr.html
prima di effettuare qualsiasi " +"caricamento di dati creati da questa estensione." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 @@ -12800,12 +12958,4 @@ msgstr "Esporta in formato PNG (solo immagini raster)" -#: ../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] "Semplifica percorso (rimuovi {0} nodo)" -msgstr[1] "Semplifica percorso (rimuovi {0} nodi)" - #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 @@ -12925,14 +13075,14 @@ msgstr "Schemi di colore" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 +#: ../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 "Dividi area" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 msgid "Splits an area by an untagged way." msgstr "Divide un'area per mezzo di un percorso senza etichette." -#: ../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 " @@ -13246,4 +13396,8 @@ msgstr "Apri immagini con ImageWayPoint" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Carica le immagini come un nuovo layer." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -13287,18 +13441,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 "Riduzione dei vertici in corso..." -#: ../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 "Approssimazione Douglas-Peucker in corso..." -#: ../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 "Rimozione dei nodi duplicati in corso..." -#: ../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" @@ -13347,7 +13501,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -13357,5 +13511,5 @@ #. 50000 #. -#. +#. #. #. @@ -13365,5 +13519,5 @@ #. 50000 #. -#. +#. #. #. @@ -13372,5 +13526,5 @@ #. 50000 #. -#. +#. #. #. @@ -13380,5 +13534,5 @@ #. 50000 #. -#. +#. #. #. @@ -13456,6 +13610,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 "" "Numero massimo di segmenti permesso per ogni percorso generato. Predefinito " @@ -13480,7 +13633,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 "" "Accuratezza della semplificazione lineare di Douglas-Peucker, misurata in " @@ -13537,6 +13689,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84 msgid "A plugin to trace water bodies on Landsat imagery." -msgstr "" -"Una estensione per tracciare le superfici acquee su immagini Landsat." +msgstr "Una estensione per tracciare le superfici acquee su immagini Landsat." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85 @@ -13552,20 +13703,19 @@ msgstr "Impossibile acquisire l'immagine" -#: ../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 "Connessione in corso" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Connesso" -#. 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 "Non connesso" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "Connessione fallita" @@ -13767,7 +13917,7 @@ "new server? (Strongly recommended)" msgstr "" -"L'estensione openstreetbugs sta utilizzando il vecchio server " -"appspot.com.
E' disponibile un nuovo server su schokokeks.org.
Si " -"vuole migrare al nuovo server? (Fortemente consigliato)" +"L'estensione openstreetbugs sta utilizzando il vecchio server appspot." +"com.
E' disponibile un nuovo server su schokokeks.org.
Si vuole " +"migrare al nuovo server? (Fortemente consigliato)" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 @@ -13796,6 +13946,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 "" "L'intestazione contiene troppi valori e non è possibile mapparla su una " @@ -13882,9 +14031,10 @@ msgstr "Estensione del file sconosciuta: {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 "Osmarender" -#: ../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 " @@ -13894,9 +14044,5 @@ "delle impostazioni della mappa nelle preferenze." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "Opzioni osmarender" - -#: ../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 "Eseguibile di Firefox" @@ -14282,17 +14428,17 @@ "preimpostazioni delle etichette." -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" msgstr "Inverti un complesso" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37 msgid "Reverses house numbers on a terrace." msgstr "Inverte i numeri civici di un complesso di edifici." -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 msgid "Reverse a Terrace" msgstr "Inverti un complesso" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110 msgid "Reverse Terrace" msgstr "Inverti complesso" @@ -14337,174 +14483,4 @@ msgid "Optional" msgstr "Opzionale" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "Unisci aree sovrapposte" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Joins areas that overlap each other" -msgstr "Unisci aree che si sovrappongono l'un l'altra" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 -msgid "Only up to two areas can be joined at the moment." -msgstr "Attualmente solo due aree possono essere unite." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 -#, java-format -msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "\"{0}\" non è chiuso e quindi non può essere unito." - -#: ../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 "" -"La/le strade selezionate hanno dei nodi fuori dalla zona dei dati " -"scaricati.\n" -"Alcuni nodi potrebbero essere cancellati accidentalmente.\n" -"Sei veramente sicuro di continuare ?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 -msgid "Please abort if you are not sure" -msgstr "Si prega di annullare se non si è sicuri" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 -msgid "Please select at least one closed way the should be joined." -msgstr "Seleziona almeno un percorso chiuso che dovrebbe essere unito." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175 -msgid "No intersection found. Nothing was changed." -msgstr "" -"Non è stata trovata alcuna intersezione. Non è stata apportata alcuna " -"modifica." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197 -msgid "Added node on all intersections" -msgstr "Nodo aggiunto su tutte le intersezioni" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221 -msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "Elimina i percorsi che non fanno parte di un multi-poligono interno" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226 -msgid "Fix relations" -msgstr "Correggi le relazioni" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 -msgid "Joined self-overlapping area" -msgstr "L'area auto-sovrapposta è stata unita" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 -msgid "Joined overlapping areas" -msgstr "Le aree sovrapposte sono state unite" - -#: ../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 "" -"Alcuni percorsi facevano parte di relazioni che sono state modificate. Per " -"favore verifica che non siano stati introdotti errori." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 -msgid "Enter values for all conflicts." -msgstr "Inserire dei valori per tutti i conflitti." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Risolvi conflitti" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312 -msgid "Fix tag conflicts" -msgstr "Correggi i conflitti di etichette" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462 -msgid "Removed Element from Relations" -msgstr "Sono stati rimossi elementi dalle Relazioni" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571 -msgid "Join Areas: Remove Short Ways" -msgstr "Unisi Aree: Elimina le way corte" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587 -msgid "Closed Way" -msgstr "Strada chiusa (anello)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854 -msgid "Remove tags from inner ways" -msgstr "Rimuovi i tag dalle way interne" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883 -msgid "Join Areas Function" -msgstr "Funzione di unione delle Aree" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Jump To Position" -msgstr "Vai alla posizione" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Opens a dialog that allows to jump to a specific location" -msgstr "" -"Apre una finestra di dialogo che consente di saltare ad un indirizzo " -"specifico." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 -msgid "Enter Lat/Lon to jump to position." -msgstr "Inserire Lat/Lon a cui andare." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 -msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "Puoi anche incollare un URL da www.openstreetmap.org" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 -msgid "Zoom (in metres)" -msgstr "Zoom (in metri)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -msgid "Jump there" -msgstr "Salta lì" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 -msgid "Jump to Position" -msgstr "Salta alla posizione" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Could not parse Latitude, Longitude or Zoom. Please check." -msgstr "" -"Non è possibile interpretare la Latitudine, la Longitudine o lo Zoom. " -"Verifica." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Unable to parse Lon/Lat" -msgstr "Impossibile interpretare longitudine/latitudine" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Simplify Way" -msgstr "Semplifica percorso" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Elimina i nodi non necessari dal percorso." - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "Selezionare almeno un percorso da semplificare." - -#: ../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] "" -"La selezione contiene {0} percorso. Sei sicuro di volerlo semplificare?" -msgstr[1] "" -"La selezione contiene {0} percorsi. Sei sicuro di volerli semplificare tutti?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "Sei sicuro?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14607,5 +14583,5 @@ msgstr "altra validazione" -#: ../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}" @@ -14658,34 +14634,34 @@ msgstr "La prossima volta ignora gli errori selezionati" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Tutto il gruppo" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Elementi singoli" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Niente" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Ignorare tutto il gruppo o i singoli elementi?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 msgid "Ignoring elements" msgstr "Ignora elementi" -#: ../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 "Correzione errori ..." -#: ../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 "Correzione ({0}/{1}): ''{2}''" -#: ../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 "Aggiornamento mappa ..." @@ -14736,19 +14712,19 @@ msgstr "Percorsi incrociati" -#: ../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 "Nodi duplicati" -#: ../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 "" "Questo controllo verifica che non ci siano due nodi nella stessa posizione." -#: ../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 "Nodi nella stessa posizione" -#: ../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 "Conferma" @@ -14998,11 +14974,10 @@ #: ../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." -msgstr "" -"Sorgente (URL o nome del file) del controllo ortografico (vedi " -"http://wiki.openstreetmap.org/index.php/User:JLS/speller) o file dati per il " -"controllo delle etichette." +"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." +"org/index.php/User:JLS/speller) or tag checking data files." +msgstr "" +"Sorgente (URL o nome del file) del controllo ortografico (vedi http://wiki." +"openstreetmap.org/index.php/User:JLS/speller) o file dati per il controllo " +"delle etichette." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 @@ -15149,5 +15124,5 @@ #. 50000 #. -#. +#. #. #. @@ -15155,5 +15130,5 @@ #. #. -#. +#. #. #. @@ -15163,5 +15138,5 @@ #. 50000 #. -#. +#. #. #. @@ -15170,5 +15145,5 @@ #. 50000 #. -#. +#. #. #. @@ -15177,5 +15152,5 @@ #. 50000 #. -#. +#. #. #. @@ -15184,5 +15159,5 @@ #. 50000 #. -#. +#. #. #. @@ -15191,5 +15166,5 @@ #. 50000 #. -#. +#. #. #. @@ -15198,9 +15173,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -15245,5 +15220,5 @@ #. 50000 #. -#. +#. #. #. @@ -15388,14 +15363,14 @@ msgstr "Walking Papers" -#: ../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 " @@ -15404,14 +15379,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 "" @@ -15420,5 +15395,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 "" @@ -15430,13 +15405,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." @@ -15608,50 +15583,50 @@ "oppure cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "Scarica i tasselli visibili" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "Cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Reload erroneous tiles" msgstr "Ricarica i tasselli non corretti" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:369 msgid "Save WMS layer to file" msgstr "Salva il livello WMS su file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "Salva livello WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "Carica il livello WMS da file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "Carica livello WMS" -#: ../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 "Versione del file WMS non supportata; trovata {0}, attesa {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "File Format Error" msgstr "Errore nel formato del file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "Errore durante il caricamento del file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -15671,6 +15646,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "Modify list of WMS servers displayed in the WMS plugin menu" -msgstr "" -"Modifica la lista dei server WMS mostrata nel menù dell'estensione WMS" +msgstr "Modifica la lista dei server WMS mostrata nel menù dell'estensione WMS" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47 @@ -15728,5 +15702,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 "" @@ -15771,26 +15745,17 @@ #. Plugin AddrInterpolation #: build/trans_plugins.java:3 -msgid "Group common Address Interpolation inputs in a single dialog," -msgstr "" -"Raggruppa gli inserimenti delle interpolazioni degli indirizzi in una " -"finestra unica," - -#. 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 "" -"Un'altra estensione JOSM per la geo-etichettatura. Correla le immagini con i " -"tracciati GPS oppure importa le immagini geo-etichettate mediante EXIF." - -#. Plugin cadastre-fr +msgid "A special handler for the French land registry WMS server." +msgstr "" +"Un particolare gestore per il server WMS del registro territoriale francese." + +#. Plugin colorscheme #: build/trans_plugins.java:7 -msgid "A special handler for the French land registry WMS server." -msgstr "" -"Un particolare gestore per il server WMS del registro territoriale francese." - -#. Plugin colorscheme -#: build/trans_plugins.java:9 msgid "" "Allows the user to create different color schemes and to switch between " @@ -15808,10 +15773,10 @@ #. Plugin Create_grid_of_ways -#: build/trans_plugins.java:11 +#: build/trans_plugins.java:9 msgid "Create a grid of ways." msgstr "Crea un reticolo di ways" #. Plugin czechaddress -#: build/trans_plugins.java:13 +#: build/trans_plugins.java:11 msgid "" "Creating and handling address nodes and buildings within Czech Republic." @@ -15821,11 +15786,10 @@ #. Plugin dataimport +#: build/trans_plugins.java:13 +msgid "Allows to import various file formats into JOSM directly." +msgstr "Permette l'importazione di file di vario formato direttamente in JOSM." + +#. Plugin DirectUpload #: build/trans_plugins.java:15 -msgid "Allows to import various file formats into JOSM directly." -msgstr "" -"Permette l'importazione di file di vario formato direttamente in JOSM." - -#. Plugin DirectUpload -#: build/trans_plugins.java:17 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " @@ -15836,10 +15800,10 @@ #. Plugin Duplicate-Way -#: build/trans_plugins.java:19 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "Duplica i percorsi con una differenza" #. Plugin editgpx -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -15850,7 +15814,6 @@ #. Plugin globalsat -#: build/trans_plugins.java:23 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" "Scarica direttamente in JOSM i punti GPS dal registratore di dati Globalsat " @@ -15858,16 +15821,16 @@ #. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" +"Visualizza le informazioni di navigazione come un grafo di navigazione." + +#. Plugin grid #: build/trans_plugins.java:25 -msgid "Visualizes routing information as a routing graph." -msgstr "" -"Visualizza le informazioni di navigazione come un grafo di navigazione." - -#. Plugin grid -#: build/trans_plugins.java:27 msgid "Provide a background layer that displays a map grid" msgstr "Fornisce un livello di sfondo che visualizza una griglia di mappa" #. Plugin ImageWayPoint -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -15881,10 +15844,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Aiuta nella vettorizzazione delle immagini WMS." #. Plugin livegps -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -15894,5 +15857,5 @@ #. Plugin measurement -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -15906,10 +15869,10 @@ #. Plugin michigan_left -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:35 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "Aggiunge divieti di svolta a sinistra per insiemi di 4 o 5 percorsi" #. Plugin multipoly -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:37 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -15920,5 +15883,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 " @@ -15932,15 +15895,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:41 msgid "Displays an OpenLayers background image" msgstr "Visualizza una immagine di sfondo OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:43 msgid "Imports issues from OpenStreetBugs" msgstr "Importa le segnalazioni da OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:45 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -15950,5 +15913,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:47 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -15958,5 +15921,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:49 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -15967,15 +15930,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:51 msgid "The great JGoodies Plastic Look and Feel." msgstr "Il grande aspetto e stile JGoodies Plastic." #. Plugin remotecontrol -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:53 msgid "Let other applications send commands to JOSM." msgstr "Permetti alle altre applicazioni di inviare comandi a JOSM." #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15987,10 +15950,10 @@ #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:57 msgid "Provides routing capabilities." msgstr "Fornisce funzioni di navigazione" #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:59 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -16001,15 +15964,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:61 msgid "Allow adding markers/nodes on current gps positions." msgstr "Permetti l'aggiunta di marcatori/nodi alle posizioni gps correnti." #. Plugin tageditor -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:63 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Fornisce un'interfaccia per l'editing dei tag in forma tabulare" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:65 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -16023,19 +15986,10 @@ #. Plugin terracer -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:67 msgid "Make terraced houses out of single blocks." msgstr "Costruisce degli edifici a schiera a partire da singoli blocchi." -#. 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 "" -"Alcune utilità per rendere la propria vita più facile: ad esempio la " -"semplificazione dei percorsi, l'unione di aree, il salto alla posizione." - #. Plugin validator -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -16047,5 +16001,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -16057,5 +16011,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -16063,5 +16017,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -17116,8 +17070,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -17314,5 +17268,5 @@ #. color motorroad #. -#. +#. #. #. @@ -17322,5 +17276,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17339,5 +17293,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17347,5 +17301,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17364,5 +17318,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17372,5 +17326,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17389,5 +17343,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17397,5 +17351,5 @@ #. 300000 #. -#. +#. #. #. @@ -17410,5 +17364,5 @@ #. 300000 #. -#. +#. #. #. @@ -17426,5 +17380,5 @@ #. 50000 #. -#. +#. #. #. @@ -17442,5 +17396,5 @@ #. 40000 #. -#. +#. #. #. @@ -17449,5 +17403,5 @@ #. 40000 #. -#. +#. #. #. @@ -17457,5 +17411,5 @@ #. 50000 #. -#. +#. #. #. @@ -17475,5 +17429,5 @@ #. 50000 #. -#. +#. #. #. @@ -17482,5 +17436,5 @@ #. 50000 #. -#. +#. #. #. @@ -17490,5 +17444,5 @@ #. 50000 #. -#. +#. #. #. @@ -17538,7 +17492,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -18237,5 +18191,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -18274,5 +18228,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -18368,5 +18322,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -18523,5 +18477,5 @@ #. 50000 #. -#. +#. #. #. @@ -19908,5 +19862,5 @@ #. 30000 #. -#. +#. #. #. @@ -19916,5 +19870,5 @@ #. 40000 #. -#. +#. #. #. @@ -19924,5 +19878,5 @@ #. 20000 #. -#. +#. #. #. @@ -19932,5 +19886,5 @@ #. 40000 #. -#. +#. #. #. @@ -20288,7 +20242,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -20298,5 +20252,5 @@ #. 50000 #. -#. +#. #. #. @@ -20306,5 +20260,5 @@ #. 50000 #. -#. +#. #. #. @@ -20314,5 +20268,5 @@ #. 50000 #. -#. +#. #. #. @@ -20322,5 +20276,5 @@ #. 50000 #. -#. +#. #. #. @@ -20330,5 +20284,5 @@ #. 50000 #. -#. +#. #. #. @@ -20338,5 +20292,5 @@ #. 50000 #. -#. +#. #. #. @@ -20346,5 +20300,5 @@ #. 50000 #. -#. +#. #. #. @@ -20354,5 +20308,5 @@ #. 50000 #. -#. +#. #. #. @@ -20362,5 +20316,5 @@ #. 50000 #. -#. +#. #. #. @@ -20370,5 +20324,5 @@ #. 50000 #. -#. +#. #. #. @@ -20378,5 +20332,5 @@ #. 50000 #. -#. +#. #. #. @@ -20386,5 +20340,5 @@ #. 50000 #. -#. +#. #. #. @@ -20394,5 +20348,5 @@ #. 50000 #. -#. +#. #. #. @@ -20402,5 +20356,5 @@ #. 50000 #. -#. +#. #. #. @@ -20410,5 +20364,5 @@ #. 50000 #. -#. +#. #. #. @@ -20418,5 +20372,5 @@ #. 50000 #. -#. +#. #. #. @@ -20426,5 +20380,5 @@ #. 50000 #. -#. +#. #. #. @@ -20434,5 +20388,5 @@ #. 50000 #. -#. +#. #. #. @@ -20442,5 +20396,5 @@ #. 50000 #. -#. +#. #. #. @@ -20450,5 +20404,5 @@ #. 50000 #. -#. +#. #. #. @@ -20458,5 +20412,5 @@ #. 50000 #. -#. +#. #. #. @@ -20466,5 +20420,5 @@ #. 50000 #. -#. +#. #. #. @@ -20474,5 +20428,5 @@ #. 50000 #. -#. +#. #. #. @@ -20482,5 +20436,5 @@ #. 50000 #. -#. +#. #. #. @@ -20490,5 +20444,5 @@ #. 50000 #. -#. +#. #. #. @@ -20498,5 +20452,5 @@ #. 50000 #. -#. +#. #. #. @@ -20506,5 +20460,5 @@ #. 50000 #. -#. +#. #. #. @@ -20514,5 +20468,5 @@ #. 50000 #. -#. +#. #. #. @@ -20522,5 +20476,5 @@ #. 50000 #. -#. +#. #. #. @@ -20530,5 +20484,5 @@ #. 50000 #. -#. +#. #. #. @@ -20538,5 +20492,5 @@ #. 50000 #. -#. +#. #. #. @@ -20546,5 +20500,5 @@ #. 50000 #. -#. +#. #. #. @@ -20554,5 +20508,5 @@ #. 50000 #. -#. +#. #. #. @@ -20562,5 +20516,5 @@ #. 50000 #. -#. +#. #. #. @@ -20570,5 +20524,5 @@ #. 50000 #. -#. +#. #. #. @@ -20578,5 +20532,5 @@ #. 50000 #. -#. +#. #. #. @@ -20586,5 +20540,5 @@ #. 50000 #. -#. +#. #. #. @@ -20594,5 +20548,5 @@ #. 50000 #. -#. +#. #. #. @@ -20602,5 +20556,5 @@ #. 50000 #. -#. +#. #. #. @@ -20610,5 +20564,5 @@ #. 50000 #. -#. +#. #. #. @@ -20618,5 +20572,5 @@ #. 50000 #. -#. +#. #. #. @@ -20626,5 +20580,5 @@ #. 50000 #. -#. +#. #. #. @@ -20634,5 +20588,5 @@ #. 50000 #. -#. +#. #. #. @@ -20642,5 +20596,5 @@ #. 50000 #. -#. +#. #. #. @@ -20650,5 +20604,5 @@ #. 50000 #. -#. +#. #. #. @@ -20658,5 +20612,5 @@ #. 50000 #. -#. +#. #. #. @@ -22350,7 +22304,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22360,5 +22314,5 @@ #. 50000 #. -#. +#. #. #. @@ -22368,5 +22322,5 @@ #. 50000 #. -#. +#. #. #. @@ -22376,5 +22330,5 @@ #. 50000 #. -#. +#. #. #. @@ -22384,5 +22338,5 @@ #. 50000 #. -#. +#. #. #. @@ -22392,5 +22346,5 @@ #. 50000 #. -#. +#. #. #. @@ -22400,5 +22354,5 @@ #. 50000 #. -#. +#. #. #. @@ -22408,5 +22362,5 @@ #. 50000 #. -#. +#. #. #. @@ -23738,5 +23692,5 @@ #. 40000 #. -#. +#. #. #. @@ -23752,5 +23706,5 @@ #. 30000 #. -#. +#. #. #. @@ -23761,7 +23715,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23771,5 +23725,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -23779,13 +23741,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -23795,5 +23749,5 @@ #. 50000 #. -#. +#. #. #. @@ -23826,5 +23780,5 @@ #. 50000 #. -#. +#. #. #. @@ -23840,5 +23794,5 @@ #. 50000 #. -#. +#. #. #. @@ -23848,5 +23802,5 @@ #. 10000 #. -#. +#. #. #. @@ -23856,5 +23810,5 @@ #. 10000 #. -#. +#. #. #. @@ -23865,5 +23819,5 @@ #. 10000 #. -#. +#. #. #. @@ -23892,5 +23846,5 @@ #. 50000 #. -#. +#. #. #. @@ -24005,9 +23959,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 @@ -24015,5 +23969,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, @@ -24023,8 +23977,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 @@ -24038,5 +23992,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -24044,5 +23998,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -24091,6 +24045,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -24170,5 +24124,5 @@ #. 40000 #. -#. +#. #. #. @@ -24178,5 +24132,5 @@ #. 10000 #. -#. +#. #. #. @@ -24185,5 +24139,5 @@ #. 50000 #. -#. +#. #. #. @@ -24193,5 +24147,5 @@ #. 50000 #. -#. +#. #. #. @@ -24200,5 +24154,5 @@ #. 50000 #. -#. +#. #. #. @@ -24207,5 +24161,5 @@ #. 50000 #. -#. +#. #. #. @@ -24214,5 +24168,5 @@ #. 50000 #. -#. +#. #. #. @@ -24221,5 +24175,5 @@ #. 50000 #. -#. +#. #. #. @@ -24228,5 +24182,5 @@ #. 40000 #. -#. +#. #. #. @@ -24235,5 +24189,5 @@ #. 50000 #. -#. +#. #. #. @@ -24242,5 +24196,5 @@ #. 50000 #. -#. +#. #. #. @@ -24249,5 +24203,5 @@ #. 50000 #. -#. +#. #. #. @@ -24256,5 +24210,5 @@ #. 50000 #. -#. +#. #. #. @@ -24263,5 +24217,5 @@ #. 50000 #. -#. +#. #. #. @@ -24270,5 +24224,5 @@ #. 50000 #. -#. +#. #. #. @@ -24278,5 +24232,5 @@ #. 50000 #. -#. +#. #. #. @@ -24285,5 +24239,5 @@ #. 50000 #. -#. +#. #. #. @@ -24294,5 +24248,5 @@ #. 50000 #. -#. +#. #. #. @@ -24304,11 +24258,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -24317,7 +24271,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24328,5 +24282,5 @@ #. 50000 #. -#. +#. #. #. @@ -24337,5 +24291,5 @@ #. 50000 #. -#. +#. #. #. @@ -24346,5 +24300,5 @@ #. 50000 #. -#. +#. #. #. @@ -24355,5 +24309,5 @@ #. 50000 #. -#. +#. #. #. @@ -24364,5 +24318,5 @@ #. 50000 #. -#. +#. #. #. @@ -24373,5 +24327,5 @@ #. 40000 #. -#. +#. #. #. @@ -24383,5 +24337,5 @@ #. 50000 #. -#. +#. #. #. @@ -24392,5 +24346,5 @@ #. 50000 #. -#. +#. #. #. @@ -24415,5 +24369,5 @@ #. 10000 #. -#. +#. #. #. @@ -24422,5 +24376,5 @@ #. 50000 #. -#. +#. #. #. @@ -24429,5 +24383,5 @@ #. 50000 #. -#. +#. #. #. @@ -24443,5 +24397,5 @@ #. 20000 #. -#. +#. #. #. @@ -24455,5 +24409,5 @@ #. 30000 #. -#. +#. #. #. @@ -24462,5 +24416,5 @@ #. 50000 #. -#. +#. #. #. @@ -24469,5 +24423,5 @@ #. 50000 #. -#. +#. #. #. @@ -24476,5 +24430,5 @@ #. 50000 #. -#. +#. #. #. @@ -24483,5 +24437,5 @@ #. 50000 #. -#. +#. #. #. @@ -24490,5 +24444,5 @@ #. 50000 #. -#. +#. #. #. @@ -24497,5 +24451,5 @@ #. 50000 #. -#. +#. #. #. @@ -24504,5 +24458,5 @@ #. 50000 #. -#. +#. #. #. @@ -24511,5 +24465,5 @@ #. 50000 #. -#. +#. #. #. @@ -24518,5 +24472,5 @@ #. 50000 #. -#. +#. #. #. @@ -24525,5 +24479,5 @@ #. 50000 #. -#. +#. #. #. @@ -24532,5 +24486,5 @@ #. 50000 #. -#. +#. #. #. @@ -24539,5 +24493,5 @@ #. 50000 #. -#. +#. #. #. @@ -24546,5 +24500,5 @@ #. 50000 #. -#. +#. #. #. @@ -24553,5 +24507,5 @@ #. 50000 #. -#. +#. #. #. @@ -24722,7 +24676,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24736,5 +24690,5 @@ #. 40000 #. -#. +#. #. #. @@ -24744,7 +24698,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24754,5 +24708,5 @@ #. 50000 #. -#. +#. #. #. @@ -24762,5 +24716,5 @@ #. 50000 #. -#. +#. #. #. @@ -24770,5 +24724,5 @@ #. 50000 #. -#. +#. #. #. @@ -24778,5 +24732,5 @@ #. 50000 #. -#. +#. #. #. @@ -24792,5 +24746,5 @@ #. 10000 #. -#. +#. #. #. @@ -24800,5 +24754,5 @@ #. 50000 #. -#. +#. #. #. @@ -24808,5 +24762,5 @@ #. 50000 #. -#. +#. #. #. @@ -24816,5 +24770,5 @@ #. 50000 #. -#. +#. #. #. @@ -24824,5 +24778,5 @@ #. 50000 #. -#. +#. #. #. @@ -24832,5 +24786,5 @@ #. 50000 #. -#. +#. #. #. @@ -24840,5 +24794,5 @@ #. 50000 #. -#. +#. #. #. @@ -24857,5 +24811,5 @@ #. 50000 #. -#. +#. #. #. @@ -24864,5 +24818,5 @@ #. 50000 #. -#. +#. #. #. @@ -24876,5 +24830,5 @@ #. 50000 #. -#. +#. #. #. @@ -24888,5 +24842,5 @@ #. 50000 #. -#. +#. #. #. @@ -24895,5 +24849,5 @@ #. 50000 #. -#. +#. #. #. @@ -24907,5 +24861,5 @@ #. 50000 #. -#. +#. #. #. @@ -24920,5 +24874,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24933,5 +24887,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24945,5 +24899,5 @@ #. 50000 #. -#. +#. #. #. @@ -24957,5 +24911,5 @@ #. 50000 #. -#. +#. #. #. @@ -24964,5 +24918,5 @@ #. 50000 #. -#. +#. #. #. @@ -24971,5 +24925,5 @@ #. 50000 #. -#. +#. #. #. @@ -24983,5 +24937,5 @@ #. 50000 #. -#. +#. #. #. @@ -24991,5 +24945,5 @@ #. 50000 #. -#. +#. #. #. @@ -24998,5 +24952,5 @@ #. 50000 #. -#. +#. #. #. @@ -25005,5 +24959,5 @@ #. 50000 #. -#. +#. #. #. @@ -25012,5 +24966,5 @@ #. 50000 #. -#. +#. #. #. @@ -25020,5 +24974,5 @@ #. 50000 #. -#. +#. #. #. @@ -25029,5 +24983,5 @@ #. 50000 #. -#. +#. #. #. @@ -25037,7 +24991,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25047,5 +25001,5 @@ #. 50000 #. -#. +#. #. #. @@ -25055,5 +25009,5 @@ #. 50000 #. -#. +#. #. #. @@ -25063,5 +25017,5 @@ #. 50000 #. -#. +#. #. #. @@ -25072,5 +25026,5 @@ #. 50000 #. -#. +#. #. #. @@ -25080,5 +25034,5 @@ #. 50000 #. -#. +#. #. #. @@ -25088,5 +25042,5 @@ #. 50000 #. -#. +#. #. #. @@ -25096,5 +25050,5 @@ #. 50000 #. -#. +#. #. #. @@ -25104,5 +25058,5 @@ #. 50000 #. -#. +#. #. #. @@ -25112,5 +25066,5 @@ #. 50000 #. -#. +#. #. #. @@ -25120,5 +25074,5 @@ #. 50000 #. -#. +#. #. #. @@ -25128,5 +25082,5 @@ #. 50000 #. -#. +#. #. #. @@ -25136,5 +25090,5 @@ #. 50000 #. -#. +#. #. #. @@ -25157,7 +25111,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25167,5 +25121,5 @@ #. 50000 #. -#. +#. #. #. @@ -25174,5 +25128,5 @@ #. 50000 #. -#. +#. #. #. @@ -25182,5 +25136,5 @@ #. 50000 #. -#. +#. #. #. @@ -25189,5 +25143,5 @@ #. 50000 #. -#. +#. #. #. @@ -25197,5 +25151,5 @@ #. 50000 #. -#. +#. #. #. @@ -25205,5 +25159,5 @@ #. 50000 #. -#. +#. #. #. @@ -25219,5 +25173,5 @@ #. 200000000 #. -#. +#. #. #. @@ -25228,5 +25182,5 @@ #. 50000 #. -#. +#. #. #. @@ -25245,5 +25199,5 @@ #. 50000 #. -#. +#. #. #. @@ -25253,5 +25207,5 @@ #. 50000 #. -#. +#. #. #. @@ -25264,5 +25218,5 @@ #. 50000 #. -#. +#. #. #. @@ -25280,5 +25234,5 @@ #. 50000 #. -#. +#. #. #. @@ -25287,5 +25241,5 @@ #. 50000 #. -#. +#. #. #. @@ -25294,5 +25248,5 @@ #. 50000 #. -#. +#. #. #. @@ -25301,7 +25255,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25312,5 +25266,5 @@ #. 50000 #. -#. +#. #. #. @@ -25325,5 +25279,5 @@ #. 50000 #. -#. +#. #. #. @@ -25337,5 +25291,5 @@ #. 50000 #. -#. +#. #. #. @@ -25345,5 +25299,5 @@ #. 50000 #. -#. +#. #. #. @@ -25357,5 +25311,5 @@ #. 50000 #. -#. +#. #. #. @@ -25369,5 +25323,5 @@ #. 50000 #. -#. +#. #. #. @@ -25376,7 +25330,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25386,5 +25340,5 @@ #. 50000 #. -#. +#. #. #. @@ -25394,5 +25348,5 @@ #. 50000 #. -#. +#. #. #. @@ -25402,5 +25356,5 @@ #. 50000 #. -#. +#. #. #. @@ -25410,5 +25364,5 @@ #. 50000 #. -#. +#. #. #. @@ -25424,7 +25378,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25439,5 +25393,5 @@ #. 30000 #. -#. +#. #. #. @@ -25452,5 +25406,5 @@ #. 30000 #. -#. +#. #. #. @@ -25465,5 +25419,5 @@ #. 30000 #. -#. +#. #. #. @@ -25478,5 +25432,5 @@ #. 30000 #. -#. +#. #. #. @@ -25491,5 +25445,5 @@ #. 30000 #. -#. +#. #. #. @@ -25504,7 +25458,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -25514,5 +25468,5 @@ #. 50000 #. -#. +#. #. #. @@ -25521,5 +25475,5 @@ #. 50000 #. -#. +#. #. #. @@ -25529,5 +25483,5 @@ #. 50000 #. -#. +#. #. #. @@ -25537,5 +25491,5 @@ #. 50000 #. -#. +#. #. #. @@ -25545,5 +25499,5 @@ #. 50000 #. -#. +#. #. #. @@ -25553,5 +25507,5 @@ #. 50000 #. -#. +#. #. #. @@ -25561,5 +25515,5 @@ #. 50000 #. -#. +#. #. #. @@ -25569,5 +25523,5 @@ #. 50000 #. -#. +#. #. #. @@ -25577,5 +25531,5 @@ #. 50000 #. -#. +#. #. #. @@ -25585,5 +25539,5 @@ #. 50000 #. -#. +#. #. #. @@ -25593,5 +25547,5 @@ #. 50000 #. -#. +#. #. #. @@ -25601,5 +25555,5 @@ #. 50000 #. -#. +#. #. #. @@ -25609,5 +25563,5 @@ #. 50000 #. -#. +#. #. #. @@ -25627,5 +25581,5 @@ #. 50000 #. -#. +#. #. #. @@ -25640,5 +25594,5 @@ #. 50000 #. -#. +#. #. #. @@ -25651,7 +25605,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25661,5 +25615,5 @@ #. 50000 #. -#. +#. #. #. @@ -25669,5 +25623,5 @@ #. 50000 #. -#. +#. #. #. @@ -25677,5 +25631,5 @@ #. 50000 #. -#. +#. #. #. @@ -25685,5 +25639,5 @@ #. 50000 #. -#. +#. #. #. @@ -25693,5 +25647,5 @@ #. 50000 #. -#. +#. #. #. @@ -25701,5 +25655,5 @@ #. 50000 #. -#. +#. #. #. @@ -25709,5 +25663,5 @@ #. 50000 #. -#. +#. #. #. @@ -25717,5 +25671,5 @@ #. 50000 #. -#. +#. #. #. @@ -25725,5 +25679,5 @@ #. 50000 #. -#. +#. #. #. @@ -25733,5 +25687,5 @@ #. 50000 #. -#. +#. #. #. @@ -25741,5 +25695,5 @@ #. 50000 #. -#. +#. #. #. @@ -25749,5 +25703,5 @@ #. 50000 #. -#. +#. #. #. @@ -25757,5 +25711,5 @@ #. 50000 #. -#. +#. #. #. @@ -25765,5 +25719,5 @@ #. 50000 #. -#. +#. #. #. @@ -25784,5 +25738,5 @@ #. 50000 #. -#. +#. #. #. @@ -25796,7 +25750,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25806,5 +25760,5 @@ #. 50000 #. -#. +#. #. #. @@ -25814,5 +25768,5 @@ #. 50000 #. -#. +#. #. #. @@ -25822,5 +25776,5 @@ #. 50000 #. -#. +#. #. #. @@ -25830,5 +25784,5 @@ #. 50000 #. -#. +#. #. #. @@ -25838,5 +25792,5 @@ #. 50000 #. -#. +#. #. #. @@ -25846,5 +25800,5 @@ #. 50000 #. -#. +#. #. #. @@ -25854,5 +25808,5 @@ #. 50000 #. -#. +#. #. #. @@ -25869,5 +25823,5 @@ #. 50000 #. -#. +#. #. #. @@ -25877,5 +25831,5 @@ #. 50000 #. -#. +#. #. #. @@ -25885,5 +25839,5 @@ #. 50000 #. -#. +#. #. #. @@ -25893,5 +25847,5 @@ #. 50000 #. -#. +#. #. #. @@ -25901,5 +25855,5 @@ #. 50000 #. -#. +#. #. #. @@ -25909,5 +25863,5 @@ #. 50000 #. -#. +#. #. #. @@ -25917,5 +25871,5 @@ #. 50000 #. -#. +#. #. #. @@ -25925,5 +25879,5 @@ #. 50000 #. -#. +#. #. #. @@ -25933,5 +25887,5 @@ #. 50000 #. -#. +#. #. #. @@ -25941,5 +25895,5 @@ #. 50000 #. -#. +#. #. #. @@ -25949,5 +25903,5 @@ #. 50000 #. -#. +#. #. #. @@ -25957,5 +25911,5 @@ #. 50000 #. -#. +#. #. #. @@ -25974,5 +25928,5 @@ #. 50000 #. -#. +#. #. #. @@ -25982,5 +25936,5 @@ #. 50000 #. -#. +#. #. #. @@ -25989,5 +25943,5 @@ #. 50000 #. -#. +#. #. #. @@ -25997,5 +25951,5 @@ #. 50000 #. -#. +#. #. #. @@ -26005,5 +25959,5 @@ #. 50000 #. -#. +#. #. #. @@ -26013,5 +25967,5 @@ #. 50000 #. -#. +#. #. #. @@ -26020,5 +25974,5 @@ #. 50000 #. -#. +#. #. #. @@ -26028,5 +25982,5 @@ #. 50000 #. -#. +#. #. #. @@ -26036,5 +25990,5 @@ #. 50000 #. -#. +#. #. #. @@ -26044,5 +25998,5 @@ #. 50000 #. -#. +#. #. #. @@ -26052,5 +26006,5 @@ #. 50000 #. -#. +#. #. #. @@ -26059,5 +26013,5 @@ #. 50000 #. -#. +#. #. #. @@ -26066,5 +26020,5 @@ #. 50000 #. -#. +#. #. #. @@ -26073,5 +26027,5 @@ #. 50000 #. -#. +#. #. #. @@ -26080,5 +26034,5 @@ #. 50000 #. -#. +#. #. #. @@ -26087,5 +26041,5 @@ #. 50000 #. -#. +#. #. #. @@ -26094,5 +26048,5 @@ #. 50000 #. -#. +#. #. #. @@ -26101,5 +26055,5 @@ #. 50000 #. -#. +#. #. #. @@ -26108,5 +26062,5 @@ #. 50000 #. -#. +#. #. #. @@ -26115,5 +26069,5 @@ #. 50000 #. -#. +#. #. #. @@ -26122,5 +26076,5 @@ #. 50000 #. -#. +#. #. #. @@ -26129,5 +26083,5 @@ #. 50000 #. -#. +#. #. #. @@ -26136,5 +26090,5 @@ #. 50000 #. -#. +#. #. #. @@ -26143,5 +26097,5 @@ #. 50000 #. -#. +#. #. #. @@ -26151,5 +26105,5 @@ #. 50000 #. -#. +#. #. #. @@ -26159,5 +26113,5 @@ #. 50000 #. -#. +#. #. #. @@ -26167,5 +26121,5 @@ #. 50000 #. -#. +#. #. #. @@ -26175,5 +26129,5 @@ #. 50000 #. -#. +#. #. #. @@ -26183,5 +26137,5 @@ #. 50000 #. -#. +#. #. #. @@ -26191,5 +26145,5 @@ #. 50000 #. -#. +#. #. #. @@ -26199,5 +26153,5 @@ #. 50000 #. -#. +#. #. #. @@ -26207,5 +26161,5 @@ #. 50000 #. -#. +#. #. #. @@ -26215,5 +26169,5 @@ #. 50000 #. -#. +#. #. #. @@ -26224,5 +26178,5 @@ #. 50000 #. -#. +#. #. #. @@ -26232,5 +26186,5 @@ #. 50000 #. -#. +#. #. #. @@ -26240,5 +26194,5 @@ #. 50000 #. -#. +#. #. #. @@ -26248,5 +26202,5 @@ #. 50000 #. -#. +#. #. #. @@ -26256,5 +26210,5 @@ #. 50000 #. -#. +#. #. #. @@ -26264,5 +26218,5 @@ #. 50000 #. -#. +#. #. #. @@ -26272,5 +26226,5 @@ #. 50000 #. -#. +#. #. #. @@ -26280,5 +26234,5 @@ #. 50000 #. -#. +#. #. #. @@ -26288,5 +26242,5 @@ #. 50000 #. -#. +#. #. #. @@ -26296,5 +26250,5 @@ #. 50000 #. -#. +#. #. #. @@ -26304,5 +26258,5 @@ #. 50000 #. -#. +#. #. #. @@ -26312,5 +26266,5 @@ #. 50000 #. -#. +#. #. #. @@ -26320,5 +26274,5 @@ #. 50000 #. -#. +#. #. #. @@ -26328,5 +26282,5 @@ #. 50000 #. -#. +#. #. #. @@ -26336,5 +26290,5 @@ #. 50000 #. -#. +#. #. #. @@ -26344,5 +26298,5 @@ #. 50000 #. -#. +#. #. #. @@ -26352,5 +26306,5 @@ #. 50000 #. -#. +#. #. #. @@ -26360,5 +26314,5 @@ #. 50000 #. -#. +#. #. #. @@ -26368,5 +26322,5 @@ #. 50000 #. -#. +#. #. #. @@ -26375,5 +26329,5 @@ #. 50000 #. -#. +#. #. #. @@ -26405,5 +26359,5 @@ #. 50000 #. -#. +#. #. #. @@ -26413,5 +26367,5 @@ #. 50000 #. -#. +#. #. #. @@ -26421,7 +26375,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26436,5 +26390,5 @@ #. 50000 #. -#. +#. #. #. @@ -26444,5 +26398,5 @@ #. 50000 #. -#. +#. #. #. @@ -26452,5 +26406,5 @@ #. 50000 #. -#. +#. #. #. @@ -26460,5 +26414,5 @@ #. 50000 #. -#. +#. #. #. @@ -26468,5 +26422,5 @@ #. 50000 #. -#. +#. #. #. @@ -26476,5 +26430,5 @@ #. 50000 #. -#. +#. #. #. @@ -26484,5 +26438,5 @@ #. 50000 #. -#. +#. #. #. @@ -26498,7 +26452,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -26508,5 +26462,5 @@ #. 50000 #. -#. +#. #. #. @@ -26516,5 +26470,5 @@ #. 50000 #. -#. +#. #. #. @@ -26524,5 +26478,5 @@ #. 50000 #. -#. +#. #. #. @@ -26532,5 +26486,5 @@ #. 50000 #. -#. +#. #. #. @@ -26540,5 +26494,5 @@ #. 50000 #. -#. +#. #. #. @@ -26548,5 +26502,5 @@ #. 50000 #. -#. +#. #. #. @@ -26556,5 +26510,5 @@ #. 50000 #. -#. +#. #. #. @@ -26564,5 +26518,5 @@ #. 50000 #. -#. +#. #. #. @@ -26572,5 +26526,5 @@ #. 50000 #. -#. +#. #. #. @@ -26580,5 +26534,5 @@ #. 50000 #. -#. +#. #. #. @@ -26588,5 +26542,5 @@ #. 50000 #. -#. +#. #. #. @@ -26596,5 +26550,5 @@ #. 50000 #. -#. +#. #. #. @@ -26604,5 +26558,5 @@ #. 50000 #. -#. +#. #. #. @@ -26612,5 +26566,5 @@ #. 50000 #. -#. +#. #. #. @@ -26620,5 +26574,5 @@ #. 50000 #. -#. +#. #. #. @@ -26628,5 +26582,5 @@ #. 50000 #. -#. +#. #. #. @@ -26636,5 +26590,5 @@ #. 50000 #. -#. +#. #. #. @@ -26644,5 +26598,5 @@ #. 50000 #. -#. +#. #. #. @@ -26652,5 +26606,5 @@ #. 50000 #. -#. +#. #. #. @@ -26660,5 +26614,5 @@ #. 50000 #. -#. +#. #. #. @@ -26668,5 +26622,5 @@ #. 50000 #. -#. +#. #. #. @@ -26676,5 +26630,5 @@ #. 50000 #. -#. +#. #. #. @@ -26684,5 +26638,5 @@ #. 50000 #. -#. +#. #. #. @@ -26692,5 +26646,5 @@ #. 50000 #. -#. +#. #. #. @@ -26700,5 +26654,5 @@ #. 50000 #. -#. +#. #. #. @@ -26708,5 +26662,5 @@ #. 50000 #. -#. +#. #. #. @@ -26716,5 +26670,5 @@ #. 50000 #. -#. +#. #. #. @@ -26724,5 +26678,5 @@ #. 50000 #. -#. +#. #. #. @@ -26732,5 +26686,5 @@ #. 50000 #. -#. +#. #. #. @@ -26740,5 +26694,5 @@ #. 50000 #. -#. +#. #. #. @@ -26748,5 +26702,5 @@ #. 50000 #. -#. +#. #. #. @@ -26756,5 +26710,5 @@ #. 50000 #. -#. +#. #. #. @@ -26764,5 +26718,5 @@ #. 50000 #. -#. +#. #. #. @@ -26772,5 +26726,5 @@ #. 50000 #. -#. +#. #. #. @@ -26780,5 +26734,5 @@ #. 50000 #. -#. +#. #. #. @@ -26788,5 +26742,5 @@ #. 50000 #. -#. +#. #. #. @@ -26796,5 +26750,5 @@ #. 50000 #. -#. +#. #. #. @@ -26804,5 +26758,5 @@ #. 50000 #. -#. +#. #. #. @@ -26812,5 +26766,5 @@ #. 50000 #. -#. +#. #. #. @@ -26820,5 +26774,5 @@ #. 50000 #. -#. +#. #. #. @@ -26828,5 +26782,5 @@ #. 50000 #. -#. +#. #. #. @@ -26836,5 +26790,5 @@ #. 50000 #. -#. +#. #. #. @@ -26870,7 +26824,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26880,5 +26834,5 @@ #. 50000 #. -#. +#. #. #. @@ -26888,5 +26842,5 @@ #. 50000 #. -#. +#. #. #. @@ -26896,5 +26850,5 @@ #. 50000 #. -#. +#. #. #. @@ -26904,5 +26858,5 @@ #. 50000 #. -#. +#. #. #. @@ -26912,5 +26866,5 @@ #. 50000 #. -#. +#. #. #. @@ -26920,5 +26874,5 @@ #. 50000 #. -#. +#. #. #. @@ -26928,5 +26882,5 @@ #. 50000 #. -#. +#. #. #. @@ -26943,5 +26897,5 @@ #. 50000 #. -#. +#. #. #. @@ -26951,5 +26905,5 @@ #. 50000 #. -#. +#. #. #. @@ -26959,5 +26913,5 @@ #. 50000 #. -#. +#. #. #. @@ -26967,5 +26921,5 @@ #. 50000 #. -#. +#. #. #. @@ -26975,5 +26929,5 @@ #. 50000 #. -#. +#. #. #. @@ -26983,5 +26937,5 @@ #. 50000 #. -#. +#. #. #. @@ -26992,5 +26946,5 @@ #. 50000 #. -#. +#. #. #. @@ -27000,5 +26954,5 @@ #. 50000 #. -#. +#. #. #. @@ -27008,5 +26962,5 @@ #. 40000 #. -#. +#. #. #. @@ -27016,5 +26970,5 @@ #. 50000 #. -#. +#. #. #. @@ -27023,5 +26977,5 @@ #. 40000 #. -#. +#. #. #. @@ -27030,5 +26984,5 @@ #. 40000 #. -#. +#. #. #. @@ -27046,7 +27000,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27056,5 +27010,5 @@ #. 50000 #. -#. +#. #. #. @@ -27064,5 +27018,5 @@ #. 50000 #. -#. +#. #. #. @@ -27072,5 +27026,5 @@ #. 50000 #. -#. +#. #. #. @@ -27080,5 +27034,5 @@ #. 50000 #. -#. +#. #. #. @@ -27088,5 +27042,5 @@ #. 50000 #. -#. +#. #. #. @@ -27096,5 +27050,5 @@ #. 50000 #. -#. +#. #. #. @@ -27104,5 +27058,5 @@ #. 50000 #. -#. +#. #. #. @@ -27112,5 +27066,5 @@ #. 50000 #. -#. +#. #. #. @@ -27120,5 +27074,5 @@ #. 50000 #. -#. +#. #. #. @@ -27137,5 +27091,5 @@ #. 50000 #. -#. +#. #. #. @@ -27149,5 +27103,5 @@ #. 50000 #. -#. +#. #. #. @@ -27161,5 +27115,5 @@ #. 50000 #. -#. +#. #. #. @@ -27169,5 +27123,5 @@ #. 50000 #. -#. +#. #. #. @@ -27181,5 +27135,5 @@ #. 50000 #. -#. +#. #. #. @@ -27193,5 +27147,5 @@ #. 50000 #. -#. +#. #. #. @@ -27205,6 +27159,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -27214,5 +27168,5 @@ #. 50000 #. -#. +#. #. #. @@ -27226,5 +27180,5 @@ #. 50000 #. -#. +#. #. #. @@ -27238,5 +27192,5 @@ #. 50000 #. -#. +#. #. #. @@ -27250,5 +27204,5 @@ #. 50000 #. -#. +#. #. #. @@ -27262,5 +27216,5 @@ #. 50000 #. -#. +#. #. #. @@ -27274,5 +27228,5 @@ #. 50000 #. -#. +#. #. #. @@ -27282,7 +27236,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27292,5 +27246,5 @@ #. 50000 #. -#. +#. #. #. @@ -27300,5 +27254,5 @@ #. 50000 #. -#. +#. #. #. @@ -27308,5 +27262,5 @@ #. 50000 #. -#. +#. #. #. @@ -27316,5 +27270,5 @@ #. 50000 #. -#. +#. #. #. @@ -27331,5 +27285,5 @@ #. 50000 #. -#. +#. #. #. @@ -27342,5 +27296,5 @@ #. 50000 #. -#. +#. #. #. @@ -27354,5 +27308,5 @@ #. 50000 #. -#. +#. #. #. @@ -27366,5 +27320,5 @@ #. 50000 #. -#. +#. #. #. @@ -27378,5 +27332,5 @@ #. 50000 #. -#. +#. #. #. @@ -27387,5 +27341,5 @@ #. 50000 #. -#. +#. #. #. @@ -27395,5 +27349,5 @@ #. 50000 #. -#. +#. #. #. @@ -27403,5 +27357,5 @@ #. 50000 #. -#. +#. #. #. @@ -27411,5 +27365,5 @@ #. 50000 #. -#. +#. #. #. @@ -27419,5 +27373,5 @@ #. 50000 #. -#. +#. #. #. @@ -27434,5 +27388,5 @@ #. 50000 #. -#. +#. #. #. @@ -27446,5 +27400,5 @@ #. 50000 #. -#. +#. #. #. @@ -27458,5 +27412,5 @@ #. 50000 #. -#. +#. #. #. @@ -27470,5 +27424,5 @@ #. 50000 #. -#. +#. #. #. @@ -27482,5 +27436,5 @@ #. 50000 #. -#. +#. #. #. @@ -27494,5 +27448,5 @@ #. 50000 #. -#. +#. #. #. @@ -27501,7 +27455,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27511,5 +27465,5 @@ #. 50000 #. -#. +#. #. #. @@ -27519,5 +27473,5 @@ #. 50000 #. -#. +#. #. #. @@ -27527,5 +27481,5 @@ #. 50000 #. -#. +#. #. #. @@ -27535,5 +27489,5 @@ #. 50000 #. -#. +#. #. #. @@ -27543,5 +27497,5 @@ #. 50000 #. -#. +#. #. #. @@ -27551,5 +27505,5 @@ #. 50000 #. -#. +#. #. #. @@ -27559,5 +27513,5 @@ #. 50000 #. -#. +#. #. #. @@ -27574,7 +27528,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27584,5 +27538,5 @@ #. 50000 #. -#. +#. #. #. @@ -27592,5 +27546,5 @@ #. 50000 #. -#. +#. #. #. @@ -27600,5 +27554,5 @@ #. 50000 #. -#. +#. #. #. @@ -27608,5 +27562,5 @@ #. 50000 #. -#. +#. #. #. @@ -27622,5 +27576,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -27669,5 +27623,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27677,5 +27631,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27685,5 +27639,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27693,5 +27647,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27701,5 +27655,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27709,5 +27663,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27717,5 +27671,5 @@ #. 50000 #. -#. +#. #. #. @@ -27725,5 +27679,5 @@ #. 50000 #. -#. +#. #. #. @@ -27733,5 +27687,5 @@ #. 50000 #. -#. +#. #. #. @@ -27741,5 +27695,5 @@ #. 50000 #. -#. +#. #. #. @@ -27749,5 +27703,5 @@ #. 50000 #. -#. +#. #. #. @@ -27757,5 +27711,5 @@ #. 50000 #. -#. +#. #. #. @@ -27775,5 +27729,5 @@ #. 50000 #. -#. +#. #. #. @@ -27782,5 +27736,5 @@ #. 50000 #. -#. +#. #. #. @@ -27789,5 +27743,5 @@ #. 50000 #. -#. +#. #. #. @@ -27796,5 +27750,5 @@ #. 40000 #. -#. +#. #. #. @@ -27803,5 +27757,5 @@ #. 40000 #. -#. +#. #. #. @@ -27810,5 +27764,5 @@ #. 40000 #. -#. +#. #. #. @@ -27903,5 +27857,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -27909,28 +27863,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 @@ -28045,5 +27999,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -28056,5 +28010,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -28079,6 +28033,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -28087,6 +28041,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -28101,6 +28055,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 @@ -28114,6 +28068,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 @@ -28133,6 +28087,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -28156,6 +28110,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 @@ -28168,4 +28122,124 @@ msgstr "" +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più " +#~ "disponibile" + +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Abilitare per caricare tutte le modifiche in una sola richiesta, " +#~ "disabilitare per utilizzare una richiesta per ogni singola primitiva " +#~ "modificata" + +#~ msgid "Images for {0}" +#~ msgstr "Immagini per {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Leggi GPX..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Non è stata trovata nessuna immagine con una data leggibile." + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS inizio: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS fine: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "differenza attuale: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "differenza fuso orario: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} in questa traccia." + +#~ msgid "Sync clock" +#~ msgstr "Sincronizza tempo" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Impossibile leggere la data nel file \"{0}\"." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Orario non presente nei dati EXIF del file \"{0}\"." + +#~ msgid "Image" +#~ msgstr "Immagine" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Fuso orario del GPS (differenza rispetto alle foto)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Sincronizza l'orario con l'unità GPS" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Impossibile decodificare l'orario inserito." + +#~ msgid "" +#~ "WARNING: no API version defined for data to upload. Falling back to " +#~ "version 0.6" +#~ msgstr "" +#~ "ATTENZIONE: non è definita alcuna versione delle API per i dati da " +#~ "caricare. Ritorno alla versione 0.6" + +#~ 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 "" +#~ "ATTENZIONE: la preferenza ''''{0}'''' o la versione delle API ''''{1}'''' " +#~ "dell''insieme dei dati richiedono l''utilizzo dei caricamenti " +#~ "differenziali, ma le API non sono in grado di gestirli. Ignorato il " +#~ "caricamento differenziale." + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "" +#~ "E'' stato richiesto il caricamento dell''estensione {0}. Questa " +#~ "estensione non è più necessaria." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - fotografie con geotag" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Apri immagini con AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "Opzioni osmarender" + +#~ msgid "Group common Address Interpolation inputs in a single dialog," +#~ msgstr "" +#~ "Raggruppa gli inserimenti delle interpolazioni degli indirizzi in una " +#~ "finestra unica," + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Un'altra estensione JOSM per la geo-etichettatura. Correla le immagini " +#~ "con i tracciati GPS oppure importa le immagini geo-etichettate mediante " +#~ "EXIF." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Alcune utilità per rendere la propria vita più facile: ad esempio la " +#~ "semplificazione dei percorsi, l'unione di aree, il salto alla posizione." + #~ msgid "No data imported." #~ msgstr "Nessun dato importato." @@ -28205,5 +28279,4 @@ #~ msgstr "Cambia" -#, java-format #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "Risolvere {0} conflitti in {1} oggetti" @@ -28224,5 +28297,4 @@ #~ msgstr "posizione" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -28252,6 +28324,6 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" #~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla " @@ -28276,7 +28348,4 @@ #~ msgstr "Impossibile connettersi al server." -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Per prima cosa inserisci le coordinate della località." - #~ msgid "Select a bookmark first." #~ msgstr "Per prima cosa, scegli un segnalibro." @@ -28284,6 +28353,6 @@ #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "" -#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse oppure " -#~ "premere Ctrl e le frecce, il punto (.) e la virgola (,)." +#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse " +#~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)." #~ msgid "name" @@ -28319,8 +28388,7 @@ #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "" -#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati sul " -#~ "server." - -#, java-format +#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati " +#~ "sul server." + #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Impossibile scaricare il plugin: {0} da {1}" @@ -28335,5 +28403,4 @@ #~ msgstr "Unire i nodi con diffenti appartenenze?" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Errore durante il caricamento della pagina {0}" @@ -28346,13 +28413,9 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" #~ "Errore Interno: impossibile controllare le condizioni dei layer. Segnala " #~ "questo come bug." - -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Cancella {1} {0}" #~ msgid "Revert" @@ -28385,8 +28448,9 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque unirli?" +#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque " +#~ "unirli?" #~ msgid "All the ways were empty" @@ -28417,5 +28481,4 @@ #~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati." -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Usa la preimpostazione ''{0}''" @@ -28425,6 +28488,6 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" #~ "I percorsi selezionati appartengono a relazioni differenti. Vuoi comunque " @@ -28440,5 +28503,4 @@ #~ msgstr "errore nella richiesta di aggiornamento" -#, java-format #~ msgid "requested: {0}" #~ msgstr "richiesta: {0}" @@ -28453,9 +28515,7 @@ #~ msgstr "Convalida" -#, java-format #~ msgid "rectifier id={0}" #~ msgstr "identificativo rectifier={0}" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\"" @@ -28487,5 +28547,4 @@ #~ msgstr "livello di ingrandimento" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "L'estensione richiede l'aggiornamento di JOSM: {0}." @@ -28499,14 +28558,10 @@ #~ msgstr "" #~ "(Si può modificare il numero di giorni dopo il quale appare questo " -#~ "avvertimento
specificando l'opzione di configurazione " -#~ "'pluginmanager.warntime'.)" +#~ "avvertimento
specificando l'opzione di configurazione 'pluginmanager." +#~ "warntime'.)" #~ msgid "Edit Properties" #~ msgstr "Modifica proprietà" -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Errore nell'eliminazione del file dell'estensione: {0}" - #~ msgid "Plugin already exists" #~ msgstr "Estensione già esistente" @@ -28545,5 +28600,4 @@ #~ msgstr "Il server non supporta i changeset (API < 0.6)" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Si prega di segnalare il problema a {0}" @@ -28554,6 +28608,6 @@ #~ msgid "Include your steps to get to the error (as detailed as possible)!" #~ msgstr "" -#~ "Includi i passi necessari per riprodurre l'errore (il più dettagliatamente " -#~ "possibile)!" +#~ "Includi i passi necessari per riprodurre l'errore (il più " +#~ "dettagliatamente possibile)!" #~ msgid "Some of the nodes are (almost) in the line" @@ -28570,9 +28624,9 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" -#~ "Prova ad aggiornare JOSM e tutte le sue estensioni all'ultima versione prima " -#~ "di segnalare un problema." +#~ "Prova ad aggiornare JOSM e tutte le sue estensioni all'ultima versione " +#~ "prima di segnalare un problema." #~ msgid "Found element in non-relation." @@ -28584,6 +28638,6 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" #~ "ATTENZIONE: la password è memorizzata in chiaro nel file delle " @@ -28602,6 +28656,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -28618,6 +28672,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example,replacing 73 with your image id: \n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28629,6 +28683,6 @@ #~ "preferenze di WMSplugin - queste saranno poi visualizzate nel menu WMS.\n" #~ "\n" -#~ "La stessa cosa può essere fatta anche manualmente nelle preferenze avanzate, " -#~ "usando il seguente schema:\n" +#~ "La stessa cosa può essere fatta anche manualmente nelle preferenze " +#~ "avanzate, usando il seguente schema:\n" #~ "wmsplugin.url.1.name=Landsat\n" #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" @@ -28640,9 +28694,9 @@ #~ "format=image/jpeg \n" #~ "\n" -#~ "Per il rettificatore di mappe Metacarta http://labs.metacarta.com/rectifier/ " -#~ ", è sufficiente inserire l'identificativo pertinente.\n" +#~ "Per il rettificatore di mappe Metacarta http://labs.metacarta.com/" +#~ "rectifier/ , è sufficiente inserire l'identificativo pertinente.\n" #~ "Per aggiungere una voce al menù relativo al rettificatore di mappe " -#~ "Metacarta, creare manualmente l'URL come in questo esempio, sostituendo 73 " -#~ "con l'identificativo della propria immagine: \n" +#~ "Metacarta, creare manualmente l'URL come in questo esempio, sostituendo " +#~ "73 con l'identificativo della propria immagine: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28654,12 +28708,11 @@ #~ msgstr "Saracinesca" -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" #~ "Il plugin {0} sembra danneggiato o non è stato possibile scaricarlo " #~ "automaticamente." -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28696,5 +28749,4 @@ #~ msgstr "Seleziona i dati dell'utente" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Impossibile aprire la cartella delle preferenze: {0}" @@ -28719,13 +28771,10 @@ #~ msgstr "tavola" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Autori: {0}" -#, java-format #~ msgid "Layers: {0}" #~ msgstr "Livelli: {0}" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Conflitti: {0}" @@ -28741,8 +28790,8 @@ #~ msgstr "Storico dell'elemento" -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "" -#~ "E'' stato ignorato un percorso perché include un nodo che non esiste: {0}\n" +#~ "E'' stato ignorato un percorso perché include un nodo che non esiste: " +#~ "{0}\n" #~ msgid "Please select one or more closed ways of at least four nodes." @@ -28777,5 +28826,6 @@ #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" #~ msgstr "" -#~ "Impostare manualmente la zona di Lambert (per posizioni incluse tra due zone)" +#~ "Impostare manualmente la zona di Lambert (per posizioni incluse tra due " +#~ "zone)" #~ msgid "Lambert Zone 4 cache file (.4)" @@ -28788,6 +28838,6 @@ #~ msgstr "File cache della zona 2 di Lambert (.2)" -#, java-format -#~ msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" #~ msgstr "" #~ "La zona di Lambert {0} nella cache è incompatibile con la zona di Lambert " @@ -28803,5 +28853,4 @@ #~ msgstr "Di base" -#, java-format #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." @@ -28826,7 +28875,7 @@ #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." #~ msgstr "" -#~ "QUESTO E'' SPERIMENTALE. Salva il tuo lavoro e verificalo prima di caricarlo." - -#, java-format +#~ "QUESTO E'' SPERIMENTALE. Salva il tuo lavoro e verificalo prima di " +#~ "caricarlo." + #~ msgid "Relation Editor: {0}" #~ msgstr "Editor relazione: {0}" @@ -28845,5 +28894,4 @@ #~ msgstr "Sposta in basso" -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -28856,5 +28904,4 @@ #~ msgstr "Aggiorna dati" -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "Modificare prima la proiezione in {0}." @@ -28864,6 +28911,6 @@ #~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You can " -#~ "adjust the sliders to manually match the photos." +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." #~ msgstr "" #~ "Un errore è stato rilevato durante il tentativo di correlare le foto al " @@ -28877,5 +28924,6 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" #~ "Non è stato trovato alcun dato da aggiornare. E' stato già aperto o " @@ -28902,25 +28950,24 @@ #~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to selected " -#~ "user, opens browser showing selected author profile page." +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." #~ msgstr "" -#~ "Strumenti per lavorare con autori/utenti. Seleziona i dati della mappa che " -#~ "appartengono ad un utente selezionato, apre il browser per la " +#~ "Strumenti per lavorare con autori/utenti. Seleziona i dati della mappa " +#~ "che appartengono ad un utente selezionato, apre il browser per la " #~ "visualizzazione della pagina del profilo dell'autore." #~ msgid "" #~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to OSM " -#~ "eg. deleting uninteresting parts of track." +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." #~ msgstr "" -#~ "La caratteristica principale dell'estensione è la possibilità di eliminare i " -#~ "punti del tracciato GPX. Questa estensione può essere utilizzata per " -#~ "preparare i tracciati per il loro caricamento su OSM, ad esempio eliminando " -#~ "le parti che non interessano di un tracciato." +#~ "La caratteristica principale dell'estensione è la possibilità di " +#~ "eliminare i punti del tracciato GPX. Questa estensione può essere " +#~ "utilizzata per preparare i tracciati per il loro caricamento su OSM, ad " +#~ "esempio eliminando le parti che non interessano di un tracciato." #~ msgid "Remove route nodes" #~ msgstr "Rimuovi nodi dell'itinerario" -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -28929,6 +28976,6 @@ #~ "{0}" #~ msgstr "" -#~ "Il file dell''estensione è già disponibile in locale. Desideri scaricare la " -#~ "versione aggiornata ed eliminare il vecchio archivio?\n" +#~ "Il file dell''estensione è già disponibile in locale. Desideri scaricare " +#~ "la versione aggiornata ed eliminare il vecchio archivio?\n" #~ "\n" #~ "{0}" @@ -28945,5 +28992,4 @@ #~ "modifiche" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28970,14 +29016,11 @@ #~ msgstr "% di lon:" -#, java-format #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "L''immagine con il percorso {0} non esiste o non è leggibile." -#, java-format #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." #~ msgstr "" #~ "\"type\" non previsto sul membro {0} della relazione {1}, ottenuto {2}." -#, java-format #~ msgid "Resolve conflicts in member list of of relation {0}" #~ msgstr "Risolvi conflitti nella lista dei membri della relazione {0}" @@ -29053,5 +29096,4 @@ #~ msgstr "Primitiva già eliminata" -#, java-format #~ msgid "removing reference from way {0}" #~ msgstr "rimozione del riferimento dal percorso {0}" @@ -29063,13 +29105,11 @@ #~ msgstr "Eliminazione di 1 primitiva" -#, java-format #~ msgid "Layer {0} must be in list of layers" #~ msgstr "Il livello {0} deve essere presente nella lista dei livelli" -#, java-format #~ msgid "Failed to load history from the server. Details:
{0}" #~ msgstr "" -#~ "E'' fallito il caricamento dello storico dal server. " -#~ "Dettagli:
{0}" +#~ "E'' fallito il caricamento dello storico dal server. Dettagli:
" +#~ "{0}" #~ msgid "Defaults (See tooltip for detailed information)" @@ -29083,6 +29123,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -29098,6 +29138,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example, replacing 73 with your image id:\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -29107,5 +29147,6 @@ #~ msgstr "" #~ "Si possono aggiungere, modificare ed eliminare elementi WMS nella scheda " -#~ "delle preferenze di WMSplugin - questi verranno visualizzati nel menu WMS.\n" +#~ "delle preferenze di WMSplugin - questi verranno visualizzati nel menu " +#~ "WMS.\n" #~ "\n" #~ "Si possono anche aggiungere manualmente nelle Preferenze Avenzate, " @@ -29121,7 +29162,7 @@ #~ "Per il Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , è " #~ "solo necessario inserire l'identificativo rilevante.\n" -#~ "Per aggiungere una voce di menu Metacarta Map Rectifier, creare manualmente " -#~ "l'indirizzo URL come in questo esempio, sostituendo 73 con l'identificativo " -#~ "della propria immagine:\n" +#~ "Per aggiungere una voce di menu Metacarta Map Rectifier, creare " +#~ "manualmente l'indirizzo URL come in questo esempio, sostituendo 73 con " +#~ "l'identificativo della propria immagine:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -29130,11 +29171,7 @@ #~ "ragionevole, e, se non si è sicuri, non utilizzarla." -#~ msgid "Sort" -#~ msgstr "Ordina" - #~ msgid "Sort the selected relation members or the whole list" #~ msgstr "Ordina i membri della relazione selezionata o l'intera lista" -#, java-format #~ msgid "Members: {0} (linked: {1})" #~ msgstr "Membri: {0} (collegato: {1})" @@ -29143,26 +29180,22 @@ #~ msgstr "Elemento dello storico" -#, java-format #~ msgid "The XML source (URL or filename) for {0} definition files." #~ msgstr "" -#~ "La sorgente XML (indirizzo URL o nome di file) per i file di definizione di " -#~ "{0}." +#~ "La sorgente XML (indirizzo URL o nome di file) per i file di definizione " +#~ "di {0}." #~ msgid "No data" #~ msgstr "Nessun dato" -#, java-format #~ msgid "" #~ "WARNING: launching browser windows for the first {0} of {1} selected " #~ "primitives only" #~ msgstr "" -#~ "ATTENZIONE: sto aprendo la finestra di visualizzazione solo per le prime {0} " -#~ "delle {1} primitive selezionate" - -#, java-format +#~ "ATTENZIONE: sto aprendo la finestra di visualizzazione solo per le prime " +#~ "{0} delle {1} primitive selezionate" + #~ msgid "Remove relation member {0} {1}" #~ msgstr "Rimuovere il membro della relazione {0} {1}" -#, java-format #~ msgid "" #~ "Uploading failed because a primitive you tried " @@ -29183,17 +29216,14 @@ #~ msgstr "Scarica riferimenti..." -#, java-format #~ msgid "" #~ "Failed to access system property ''{0}'' for security reasons. Exception " #~ "was: {1}" #~ msgstr "" -#~ "E'' fallito il tentativo di accedere alla proprietà di sistema ''{0}'' per " -#~ "ragioni di sicurezza. L''eccezione è stata: {1}" - -#, java-format +#~ "E'' fallito il tentativo di accedere alla proprietà di sistema ''{0}'' " +#~ "per ragioni di sicurezza. L''eccezione è stata: {1}" + #~ msgid "Unknown file extension for file ''{0}''" #~ msgstr "Estensione del file sconosciuta per il file ''{0}''" -#, java-format #~ msgid "An error occurred while saving. Error is: {0}" #~ msgstr "" @@ -29206,5 +29236,4 @@ #~ msgstr "Collegato" -#, java-format #~ msgid "" #~ "There are unsaved changes in {0} layer. Discard the changes and continue?" @@ -29212,9 +29241,9 @@ #~ "There are unsaved changes in {0} layers. Discard the changes and continue?" #~ msgstr[0] "" -#~ "Ci sono dei cambiamenti non salvati nel layer {0}. Ignorare i cambiamenti e " -#~ "continuare?" +#~ "Ci sono dei cambiamenti non salvati nel layer {0}. Ignorare i cambiamenti " +#~ "e continuare?" #~ msgstr[1] "" -#~ "Ci sono dei cambiamenti non salvati nei layer {0}. Ignorare i cambiamenti e " -#~ "continuare?" +#~ "Ci sono dei cambiamenti non salvati nei layer {0}. Ignorare i cambiamenti " +#~ "e continuare?" #~ msgid "Close current changeset" @@ -29225,21 +29254,19 @@ #~ msgid "" -#~ "Select to upload the data using a new changeset and to leave the changeset " -#~ "open after the upload" +#~ "Select to upload the data using a new changeset and to leave the " +#~ "changeset open after the upload" #~ msgstr "" -#~ "Selezionare per caricare i dati usando un nuovo changeset e per chiudere il " -#~ "changeset dopo il caricamento" - -#, java-format +#~ "Selezionare per caricare i dati usando un nuovo changeset e per chiudere " +#~ "il changeset dopo il caricamento" + #~ msgid "Help page missing. Create it in English." #~ msgstr "Pagina di help mancante. Creala in italiano." -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" -#~ "Pagina di aiuto mancante. Crearla in inglese oppure nella propria lingua." +#~ "Pagina di aiuto mancante. Crearla in inglese oppure " +#~ "nella propria lingua." #~ msgid "Helppage missing. Create it in English." @@ -29247,11 +29274,10 @@ #~ msgid "" -#~ "Helppage missing. Create it in English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" -#~ "Pagina di aiuto mancante. crearla in italiano oppure la propria lingua." - -#, java-format +#~ "Pagina di aiuto mancante. crearla in italiano oppure " +#~ "la propria lingua." + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "Valore di ritorno inatteso. Ottenuto {0}" @@ -29266,5 +29292,4 @@ #~ msgstr "non è stata trovata la versione più recente. Lo storico è vuoto." -#, java-format #~ msgid "Index out of bounds. Got {0}." #~ msgstr "indice fuori dai limiti Ottenuto {0}" @@ -29273,14 +29298,13 @@ #~ msgstr "Visualizza lo storico della primitiva selezionata" -#, java-format #~ msgid "" #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." #~ msgstr "" -#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto " -#~ "''{1}''" - -#, java-format +#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo int, " +#~ "ricevuto ''{1}''" + #~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''." +#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " +#~ "''{1}''." #~ msgstr "" #~ "valore non valido per attributo obbligatorio ''{0}'' di tipo int (>=0), " @@ -29289,30 +29313,28 @@ #~ msgid "Replace the way this member refers to with the combined way" #~ msgstr "" -#~ "Sostituisci il percorso a cui fa riferimento questo membro con il percorso " -#~ "unito" +#~ "Sostituisci il percorso a cui fa riferimento questo membro con il " +#~ "percorso unito" #~ msgid "Replace" #~ msgstr "Sostituisci" -#, java-format #~ msgid "" -#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " -#~ "from relation?" +#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." +#~ "
Delete from relation?" #~ msgstr "" #~ "La selezione \"{0}\" è utilizzata dalla relazione \"{1}\" con ruolo " #~ "{2}.
Eliminare dalla relazione?" -#, java-format #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" #~ msgstr "" -#~ "L'intestazione dell'errore \"{0}\" non corrisponde allo schema atteso \"{1}\"" - -#, java-format +#~ "L'intestazione dell'errore \"{0}\" non corrisponde allo schema atteso " +#~ "\"{1}\"" + #~ msgid "" #~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " #~ "relation?" #~ msgstr "" -#~ "La selezione \"{0}\" è utilizzata dalla relazione " -#~ "\"{1}\".
Eliminare dalla relazione?" +#~ "La selezione \"{0}\" è utilizzata dalla relazione \"{1}\"." +#~ "
Eliminare dalla relazione?" #~ msgid "Can't search because there is no loaded data." @@ -29327,6 +29349,6 @@ #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" #~ msgstr "" -#~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0} e " -#~ "versione {1}" +#~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0} " +#~ "e versione {1}" #~ msgid "Didn't find an primitive with id {0} in this dataset" @@ -29334,50 +29356,41 @@ #~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0}" -#, java-format #~ msgid "Relation: from {0} to {1} via {2}" #~ msgstr "Relazione: da {0} a {1} tramite {2}" -#, java-format #~ msgid "Processing {0}" #~ msgstr "Elaborazione {0}" -#, java-format #~ msgid "{0} extrem nodes." #~ msgstr "{0} nodi estremi." -#, java-format #~ msgid "Via node {0}, {1}" #~ msgstr "Tramite nodo {0}, {1}" -#, java-format #~ msgid "{0} via nodes." #~ msgstr "{0} nodi intermedi." -#, java-format #~ msgid "MIddle way: {0}" #~ msgstr "Percorso intermedio: {0}" -#, java-format #~ msgid "" -#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back to " -#~ "default geometry. Details: {1}" +#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back " +#~ "to default geometry. Details: {1}" #~ msgstr "" #~ "Attenzione: fallito il ripristino della geometria della finestra dalla " #~ "chiave ''''{0}''''. Ritorno alla geometria predefinita. Dettagli: {1}" -#, java-format #~ msgid "" #~ "Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -#~ "changeset will automatically be closed by the server after a timeout." +#~ "changeset will automatically be closed by the server after a timeout." #~ msgstr "" -#~ "Fallita la chiusura dell''insieme di modifiche ''''{0}'''' sul server " -#~ "OSM ''''{1}''''.
L''insieme di modifiche sarà automaticamente chiuso dal " -#~ "server dopo un intervallo massimo di attesa." - -#, java-format +#~ "Fallita la chiusura dell''insieme di modifiche ''''{0}'''' sul " +#~ "server OSM ''''{1}''''.
L''insieme di modifiche sarà automaticamente " +#~ "chiuso dal server dopo un intervallo massimo di attesa." + #~ msgid "Preset group ''{0}'' of group ''{1}''" #~ msgstr "Gruppo di preimpostati ''''{0}'''' del gruppo ''''{1}''''" -#, java-format #~ msgid "" #~ "Plugin {0} version {1} found but for this version of JOSM is at least " @@ -29391,5 +29404,4 @@ #~ msgstr "Imposta manualmente la zona di Lambert" -#, java-format #~ msgid "" #~ "Current layer is in Lambert CC9 Zone \"{0}\"\n" Index: /applications/editors/josm/i18n/po/ja.po =================================================================== --- /applications/editors/josm/i18n/po/ja.po (revision 18974) +++ /applications/editors/josm/i18n/po/ja.po (revision 18975) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 16:20+0100\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" "PO-Revision-Date: 2009-11-29 14:47+0000\n" "Last-Translator: higa4 \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:04+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:16+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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" @@ -107,5 +106,6 @@ #, java-format msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "ファイル ''{0}'' が読み込めません。
エラー内容:
{1}" +msgstr "" +"ファイル ''{0}'' が読み込めません。
エラー内容:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -116,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 @@ -137,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 @@ -155,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 @@ -187,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 "エラー" @@ -267,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 "プラグイン" @@ -281,6 +277,6 @@ "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"警告: 予想外のAPI ベースURLのフォーマット。OSM プリミティブの情報や履歴のページにリダイレクトすると、おそらく失敗します。API ベース " -"URL は \"{0}\" です。" +"警告: 予想外のAPI ベースURLのフォーマット。OSM プリミティブの情報や履歴のペー" +"ジにリダイレクトすると、おそらく失敗します。API ベース URL は \"{0}\" です。" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 @@ -290,6 +286,6 @@ "user will probably fail. API base URL is: ''{0}''" msgstr "" -"警告: 予想外のAPI ベースURLのフォーマット。OSM ユーザーのページにリダイレクトすると、おそらく失敗します。API ベース URL は " -"\"{0}\" です。" +"警告: 予想外のAPI ベースURLのフォーマット。OSM ユーザーのページにリダイレクト" +"すると、おそらく失敗します。API ベース URL は \"{0}\" です。" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 @@ -299,5 +295,6 @@ "screen with browser windows
and take some time to finish." msgstr "" -"{0} ブラウザウィンドウを起動しようとしています。
画面がブラウザウィンドウで散らかり
終わらせるのに少し時間が掛かります。" +"{0} ブラウザウィンドウを起動しようとしています。
画面がブラウザウィンドウ" +"で散らかり
終わらせるのに少し時間が掛かります。" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 @@ -311,4 +308,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 @@ -316,8 +315,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 @@ -327,29 +326,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 @@ -359,5 +356,7 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118 msgid "Please select at least one already uploaded node, way, or relation." -msgstr "少なくとも一つはアップロード済みのノード・ウェイ・リレーションを選択してください。" +msgstr "" +"少なくとも一つはアップロード済みのノード・ウェイ・リレーションを選択してくだ" +"さい。" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 @@ -378,7 +377,9 @@ #, java-format msgid "" -"There are no layers the source layer
''{0}''
could be merged " -"to." -msgstr "統合元のレイヤー
''{0}''
を、統合する先のレイヤーがありません。" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" +"統合元のレイヤー
''{0}''
を、統合する先のレイヤーがありません。" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 @@ -429,14 +430,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 "経度" @@ -462,10 +463,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 @@ -496,19 +497,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 @@ -517,9 +521,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 @@ -535,7 +536,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 @@ -547,11 +548,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" @@ -639,5 +640,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}" @@ -686,12 +687,13 @@ "Could not combine ways (They could not be merged into a single string of " "nodes)" -msgstr "ウェイを結合できません（これらをノードの一列として統合することができません）" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +msgstr "" +"ウェイを結合できません（これらをノードの一列として統合することができません）" + +#: ../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 "結合するウェイを少なくとも二つ選択してください。" @@ -710,32 +712,34 @@ 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 "選ばれた3つのノードから円形を作成します。" -#: ../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 " "three nodes." -msgstr "正確に２つないしは３つのノード、または正確に２つないしは３つのノードを持つ一つのウェイ、を選択してください。" +msgstr "" +"正確に２つないしは３つのノード、または正確に２つないしは３つのノードを持つ一" +"つのウェイ、を選択してください。" #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18 #: ../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 @@ -794,5 +798,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40 msgid "Download primitives referring to one of the selected primitives" -msgstr "選択したプリミティブの一つを参照しているプリミティブをダウンロードします。" +msgstr "" +"選択したプリミティブの一つを参照しているプリミティブをダウンロードします。" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87 @@ -807,21 +812,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" @@ -829,6 +838,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 @@ -857,5 +866,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 "複製" @@ -912,8 +921,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 @@ -921,5 +928,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 @@ -932,8 +939,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 @@ -952,8 +959,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 @@ -976,13 +983,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 @@ -998,5 +1006,7 @@ #, java-format msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." -msgstr "OSMデータレイヤーかGPXレイヤーのインスタンスが予期されています。 入力値: ''{0}''。" +msgstr "" +"OSMデータレイヤーかGPXレイヤーのインスタンスが予期されています。 入力値: " +"''{0}''。" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 @@ -1022,4 +1032,105 @@ msgstr "OSM ノード、ウェイまたはリレーションについてのオブジェクト情報を表示" +#: ../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 "現在最大2つまでのエリアのみ結合できます。" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#, java-format +msgid "\"{0}\" is not closed and therefore can't be joined." +msgstr "\"{0}\" は閉じられていないので連結できません。" + +#: ../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 "" +"選択されたウェイにはダウンロードされたデータ領域の外側にノードがあります。\n" +"これはノードを誤って削除する可能性があります。\n" +"本当に続けますか？" + +#: ../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 @@ -1039,4 +1150,46 @@ 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 "www.openstreetmap.orgから、URLを貼り付けることもできます。" + +#: ../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 "URL" + +#: ../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" @@ -1047,32 +1200,34 @@ 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 "" "Cannot merge nodes: Would have to delete way ''{0}'' which is still used." -msgstr "ノードをマージできません：おそらく使用中のウェイ ''{0}'' を削除する必要があります。" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264 +msgstr "" +"ノードをマージできません：おそらく使用中のウェイ ''{0}'' を削除する必要があり" +"ます。" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231 #, java-format msgid "Merge {0} nodes" @@ -1256,7 +1411,7 @@ "projection to get rid of this warning.
Do you want to continue?" msgstr "" -"今、EPSG:4326 " -"投影法を使っています。これは、長方形整列を行うと
望ましくない結果を引き起こすかもしれません。
この警告を消すには、投影法を変えて見てください" -"。
続けますか?" +"今、EPSG:4326 投影法を使っています。これは、長方形整列を行うと
望ま" +"しくない結果を引き起こすかもしれません。
この警告を消すには、投影法を変え" +"て見てください。
続けますか?" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 @@ -1290,5 +1445,6 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "クリップボードのコンテンツのタグを、すべての選択したアイテムに適用します。" +msgstr "" +"クリップボードのコンテンツのタグを、すべての選択したアイテムに適用します。" #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 @@ -1402,5 +1558,7 @@ "There are unresolved conflicts. Conflicts will not be saved and handled as " "if you rejected all. Continue?" -msgstr "未解決の競合があります。競合箇所は保存されず、あなたがすべて否定した様に扱われます。続けますか？" +msgstr "" +"未解決の競合があります。競合箇所は保存されず、あなたがすべて否定した様に扱わ" +"れます。続けますか？" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 @@ -1436,5 +1594,7 @@ "Select all undeleted objects in the data layer. This selects incomplete " "objects too." -msgstr "データレイヤーの復元されるオブジェクトをすべて選択してください。不完全なオブジェクトも選択します。" +msgstr "" +"データレイヤーの復元されるオブジェクトをすべて選択してください。不完全なオブ" +"ジェクトも選択します。" #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 @@ -1444,6 +1604,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 "バグに添付できる有用な情報と一緒にステータスレポートを表示する" @@ -1463,9 +1622,39 @@ #: ../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] "選択には {0} ウェイが含まれます。本当に簡略化しますか？" + +#: ../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] "ウェイの簡素化 ( {0} このノードを削除)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1494,5 +1683,7 @@ "There is more than one way using the nodes you selected. Please select the " "way also." -msgstr[0] "一つ以上のウェイが、あなたの選択したこのノードを使っています。ウェイも選択してください。" +msgstr[0] "" +"一つ以上のウェイが、あなたの選択したこのノードを使っています。ウェイも選択し" +"てください。" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:172 @@ -1508,5 +1699,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273 msgid "You must select two or more nodes to split a circular way." -msgstr "円形につながったウェイの分割には、二つ以上のノードを選択する必要があります。" +msgstr "" +"円形につながったウェイの分割には、二つ以上のノードを選択する必要があります。" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:279 @@ -1514,5 +1706,7 @@ "The way cannot be split at the selected nodes. (Hint: Select nodes in the " "middle of the way.)" -msgstr "ウェイは選択したノードで分割できません（ヒント：ウェイの真ん中のノードを選択する）" +msgstr "" +"ウェイは選択したノードで分割できません（ヒント：ウェイの真ん中のノードを選択" +"する）" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371 @@ -1521,5 +1715,6 @@ "should verify this and correct it when necessary." msgstr "" -"リレーションのメンバーであるロールは、全ての新しいウェイにコピーされました。
これらを確認して必要なら訂正してください。" +"リレーションのメンバーであるロールは、全ての新しいウェイにコピーされま" +"した。
これらを確認して必要なら訂正してください。" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 @@ -1528,5 +1723,6 @@ "this and correct it when necessary." msgstr "" -"リレーションのメンバーは全ての新しいウェイにコピーされました。
これらを確認して必要なら訂正してください。" +"リレーションのメンバーは全ての新しいウェイにコピーされました。
これ" +"らを確認して必要なら訂正してください。" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 @@ -1587,6 +1783,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 "* 1つ以上のウェイに使われている1つのノードとそのウェイの1つ, または" @@ -1594,10 +1789,12 @@ msgid "" "* One way that has one or more nodes that are used by more than one way, or" -msgstr "* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または" +msgstr "" +"* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "" "* One way and one or more of its nodes that are used by more than one way." -msgstr "* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。" +msgstr "" +"* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 @@ -1608,6 +1805,8 @@ "own copy and all nodes will be selected." msgstr "" -"備考：ウェイが選択されていれば、引き離されたノードのあたらしいコピーがつくられます。\n" -"そして新しいノードが選択状態になります。そうでなければ、全てのウェイの自身の\n" +"備考：ウェイが選択されていれば、引き離されたノードのあたらしいコピーがつくら" +"れます。\n" +"そして新しいノードが選択状態になります。そうでなければ、全てのウェイの自身" +"の\n" "コピーが作られ、全てのノードが選択状態になります。" @@ -1665,91 +1864,94 @@ #. 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 "現在のデータセットには ID {0} のオブジェクトがありません" -#: ../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 +msgstr "" +"サーバから（再ダウンロードデータ）現在選択されたオブジェクトを更新します" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 msgid "Update Selection" msgstr "選択を更新" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../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:128 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 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 "OSMサーバへの有効なデータレイヤーの全ての変更をアップロード" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 #, java-format msgid "" "There are unresolved conflicts in layer ''{0}''.
You have to " "resolve them first." -msgstr "レイヤー ''{0}'' に未解決の競合があります。
これを最初に解決してください。" - -#: ../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 +msgstr "" +"レイヤー ''{0}'' に未解決の競合があります。
これを最初に解決してくだ" +"さい。" + +#: ../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 "ノード {0} だけを同期" -#: ../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 "ウェイ {0} だけを同期" -#: ../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 "リレーション {0} だけを同期" -#: ../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 "" @@ -1757,38 +1959,39 @@ "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 "" -"アップロード失敗: " -"サーバーはあなたのノード・ウェイ・リレーションのどれかに、
もっと新しいバージョンのものを持っているようです。
この競合は、id " -"{1} の {0} でおきました。
サーバーにあるバージョンは {2} " -"で、あなたのは {3} です。

競合したプリミティブのみを同期させるには、{4}をクリックしてください。 " -"
全ローカルセットを同期させるには、{5} " -"をクリックしてください。
中止して編集を継続するには、{6} をクリックしてください。
" - -#: ../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 "" +"アップロード失敗: サーバーはあなたのノード・ウェイ・リ" +"レーションのどれかに、
もっと新しいバージョンのものを持っているようです。" +"
この競合は、id {1} の {0} でおきまし" +"た。
サーバーにあるバージョンは {2} で、あなたのは {3} です。

競合" +"したプリミティブのみを同期させるには、{4}をクリックしてくだ" +"さい。
全ローカルセットを同期させるには、{5} をクリック" +"してください。
中止して編集を継続するには、{6} をクリック" +"してください。
" + +#: ../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 "" -"アップロード失敗: " -"サーバーはあなたのノード・ウェイ・リレーションのどれかに、
もっと新しいバージョンのものを持っているようです。
全ローカルセットを同期させるに" -"は、{0} をクリックしてください。
中止して編集を継続するには、{1} " -"をクリックしてください。
" - -#: ../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 "" +"アップロード失敗: サーバーはあなたのノード・ウェイ・リ" +"レーションのどれかに、
もっと新しいバージョンのものを持っているようです。" +"
全ローカルセットを同期させるには、{0} をクリックしてくだ" +"さい。
中止して編集を継続するには、{1} をクリックしてくだ" +"さい。
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1797,25 +2000,26 @@ "again with a new or an existing open changeset." msgstr "" -"アップロード 失敗: あなたが
チェンジセット {0} を使用しています。それはすでに {1} " -"に閉じられましたので、
もう一度新規または既に開いている変更セットをアップロードしてください。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 +"アップロード 失敗: あなたが
チェンジセット {0} を使" +"用しています。それはすでに {1} に閉じられましたので、
もう一度新規または既" +"に開いている変更セットをアップロードしてください。" + +#: ../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 "クリックしてノード {0}用の全ての親ウェイをダウンロード" -#: ../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 "" @@ -1825,19 +2029,20 @@ "conflicts which you can resolve in the Conflict Resolution Dialog." msgstr "" -"アップロード 失敗 ウェイ {1} が使用中のノード {0} " -"を削除しようとしました。

{2} をクリックしてノード {0} " -"の全ての親ウェイをダウンロードしてください。
必要ならJOSM は競合解決ダイアログで解決できる競合として作成します。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 +"アップロード 失敗 ウェイ {1} が使用中のノード {0} を削" +"除しようとしました。

{2} をクリックしてノード {0} の" +"全ての親ウェイをダウンロードしてください。
必要ならJOSM は競合解決ダイアロ" +"グで解決できる競合として作成します。" + +#: ../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 "警告: エラーヘッダ \"{0}\" は想定されたパターンに一致しません" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 msgid "Updating primitive" msgstr "プリミティブ更新中" @@ -1849,46 +2054,49 @@ #. 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 "" "Warning: object ''{0}'' is already deleted on the server. Skipping this " "object and retrying to upload." -msgstr "警告 : オブジェクト ''{0}'' はサーバから既に削除されています。このオブジェクトをスキップしてもう一度アップロードします。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 +msgstr "" +"警告 : オブジェクト ''{0}'' はサーバから既に削除されています。このオブジェク" +"トをスキップしてもう一度アップロードします。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." -msgstr "オブジェクト ''{0}'' は既に削除されています。アップロード中のオブジェクトをスキップします。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 +msgstr "" +"オブジェクト ''{0}'' は既に削除されています。アップロード中のオブジェクトをス" +"キップします。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630 #, java-format msgid "Uploading {0} objects ..." msgstr "{0} オブジェクトをアップロード中 ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 -#, java-format -msgid "" -"Ignoring caught exception because upload is canceled. Exception is: {0}" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" msgstr "アップロードがキャンセルされたため捕捉した例外を無視します。例外: {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45 +#: ../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 "現在の選択の変更を全てOSMサーバにアップロード" -#: ../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 "''{0}'' の親を読み込み中" -#: ../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,5 +2243,7 @@ "Click to check whether objects in your local dataset are deleted on the " "server" -msgstr "クリックしてあなたのローカルデータセット中の天気オブジェクトがサーバから削除されているかどうかチェック" +msgstr "" +"クリックしてあなたのローカルデータセット中の天気オブジェクトがサーバから削除" +"されているかどうかチェック" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163 @@ -2052,11 +2262,12 @@ "deleted on the server. If you later try to delete or
update them the " "server is likely to report a
conflict.

Click {1} " -"to check the state of these primitives
on the server.
Click " -"{2} to ignore.
" -msgstr "" -"あなたのローカルセットにある{0} " -"個のプリミティブが、
おそらくサーバーでは削除されています。これらをあとで削除したり、更新しようとすると、サーバーは
競合
と報告するで" -"しょう。
サーバー上のこれらのプリミティブの状態を確認するには
{1}をクリックしてください。 " -"
無視するには、{2}をクリックしてください。
" +"to check the state of these primitives
on the server.
Click {2}" +" to ignore.
" +msgstr "" +"あなたのローカルセットにある{0} 個のプリミティブが、
おそらくサー" +"バーでは削除されています。これらをあとで削除したり、更新しようとすると、サー" +"バーは
競合
と報告するでしょう。
サーバー上のこれらのプリミティブの" +"状態を確認するには
{1}をクリックしてください。
無視す" +"るには、{2}をクリックしてください。
" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183 @@ -2101,5 +2312,6 @@ "when deleting a way. Ctrl: delete referring objects." msgstr "" -"クリックすると削除。SHIFT: ウェイセグメントを削除。Alt: ウェイを消すときにノードは消さない。 Ctrl: 参照するオブジェクトを消す。" +"クリックすると削除。SHIFT: ウェイセグメントを削除。Alt: ウェイを消すときに" +"ノードは消さない。 Ctrl: 参照するオブジェクトを消す。" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 @@ -2123,38 +2335,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." @@ -2162,14 +2374,14 @@ msgstr[0] "新規ノードを {0}このウェイに追加します。" -#: ../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 "描画の完了" @@ -2204,9 +2416,9 @@ #: ../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." -msgstr "" -"再生の先頭へドラッグするか、音声をトラックの近くで離してください。; " -"SHIFTキーを押しながらドラッグ状態をリリースするとそのポイントに音声が同期します." +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"再生の先頭へドラッグするか、音声をトラックの近くで離してください。; SHIFTキー" +"を押しながらドラッグ状態をリリースするとそのポイントに音声が同期します." #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 @@ -2248,5 +2460,6 @@ "Really move them?" msgstr "" -"{0} 件以上の要素が移動されました。大量の要素を移動するというのは、よくある間違いでしょう。\n" +"{0} 件以上の要素が移動されました。大量の要素を移動するというのは、よくある間" +"違いでしょう。\n" "本当に移動しますか？" @@ -2262,5 +2475,7 @@ msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "移動を止めるには、マウスのボタンを放してください。Ctrlキーで、近くのノードとマージします。" +msgstr "" +"移動を止めるには、マウスのボタンを放してください。Ctrlキーで、近くのノードと" +"マージします。" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 @@ -2273,5 +2488,6 @@ "Ctrl to rotate selected; or change selection" msgstr "" -"ドラッグでオブジェクトを動かす;Shiftキーで、選択を加える。(Ctrlキーで切り替え);Shft-Ctrlで選択を回転。;選択を変更。" +"ドラッグでオブジェクトを動かす;Shiftキーで、選択を加える。(Ctrlキーで切り替" +"え);Shft-Ctrlで選択を回転。;選択を変更。" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 @@ -2290,5 +2506,6 @@ "move zoom with right button" msgstr "" -"ドラッグによるズーム、Ctrl+\".\" or Ctrl+\",\"; Ctrl+\"↑/←/↓/→\" を押しながら移動; 右ドラッグによるズーム" +"ドラッグによるズーム、Ctrl+\".\" or Ctrl+\",\"; Ctrl+\"↑/←/↓/→\" を押しながら" +"移動; 右ドラッグによるズーム" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 @@ -2303,5 +2520,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." @@ -2342,9 +2559,11 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "ベイカー ストリート - 任意のキーや名前の 'ベイカー' と 'ストリート'。" +msgstr "" +"ベイカー ストリート - 任意のキーや名前の 'ベイカー' と 'ストリート'。" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "\"ベイカー ストリート\" - 任意のキーや名前の 'ベイカー ストリート'。" +msgstr "" +"\"ベイカー ストリート\" - 任意のキーや名前の 'ベイカー ストリート'。" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 @@ -2361,6 +2580,6 @@ "type=, *=*, *=" msgstr "" -"type=* - キー 'type' はどんな値でも良い。 また *=value, type=, " -"*=*, *=もできます。" +"type=* - キー 'type' はどんな値でも良い。 また *=value, " +"type=, *=*, *=もできます。" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 @@ -2379,5 +2598,6 @@ msgid "" "type: - type of the object (node, way, relation)" -msgstr "type: - オブジェクトの型 (node, way, relation)" +msgstr "" +"type: - オブジェクトの型 (node, way, relation)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 @@ -2386,12 +2606,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - 該当ユーザに変更された全オブジェクト" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - オブジェクトに与えられた ID (0 は新しいオブジェクト)" -#: ../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 "nodes:... - 指定されたノード番号のオブジェクト" -#: ../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-" @@ -2399,43 +2624,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 "child 式 - 式にマッチしたオブジェクトの全ての子" -#: ../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 "parent 式 - 式にマッチしたオブジェクトの全ての親" -#: ../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 "| や ORを、論理和をとるために使う" -#: ../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 @@ -2445,55 +2670,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 "''{0}''を検索することにより、何も選択肢に加えられませんでした。" -#: ../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 "''{0}''を検索することにより、何も選択肢から除かれませんでした。" -#: ../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 "''{0}'' を探しましたがセレクションの中には見つかりませんでした" -#: ../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 "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2502,44 +2727,49 @@ "{2}" msgstr "" -"正規表現 \"{0}\" は、オフセット {1} に区切りエラーがあります。全エラーメッセージは:\n" +"正規表現 \"{0}\" は、オフセット {1} に区切りエラーがあります。全エラーメッ" +"セージは:\n" "\n" "{2}" -#: ../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 "タグオペレーターを使っている時は、キーは空ではいけません。例えば、こうしてください: key=value" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 +msgstr "" +"タグオペレーターを使っている時は、キーは空ではいけません。例えば、こうしてく" +"ださい: key=value" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "パターン文法エラー: {1} 内のパターン {0} は正しくありません！" -#: ../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 "不明なプリミティブタイプです: {0}. 許される値は、\"node\", \"way\" そして \"relation\"です。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 +msgstr "" +"不明なプリミティブタイプです: {0}. 許される値は、\"node\", \"way\" そして " +"\"relation\"です。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570 #, java-format msgid "Unexpected token: {0}" msgstr "予想外のトークン: {0}" -#: ../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 "orに引数がありません。" -#: ../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 "not に引数がありません。" -#: ../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 "" @@ -2548,16 +2778,18 @@ 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 "" "Incorrect value of nodes operator: {0}. Nodes operator expects number of " "nodes or range, for example nodes:10-20" -msgstr "不正なノード演算子の値: {0}。ノード演算子はノードの数や範囲で指定してください、例えば ノード: 10-20" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 +msgstr "" +"不正なノード演算子の値: {0}。ノード演算子はノードの数や範囲で指定してくださ" +"い、例えば ノード: 10-20" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2598,5 +2830,6 @@ "Current number of changes exceeds the max. number of changes, current is " "{0}, max is {1}" -msgstr "現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}です。" +msgstr "" +"現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}です。" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 @@ -2606,16 +2839,19 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" -msgstr "警告：削除されたプリミティブ {1} のタグ\"{0}\"の値が、自動的に切り詰められます。" +#, fuzzy, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" +msgstr "" +"警告：削除されたプリミティブ {1} のタグ\"{0}\"の値が、自動的に切り詰められま" +"す。" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." -msgstr "プリミティブ{1}のタグ\"{0}\"の値の長さが最大値を超えています。有効な長さは{2}です。値の長さは{3}です。" +msgstr "" +"プリミティブ{1}のタグ\"{0}\"の値の長さが最大値を超えています。有効な長さは{2}" +"です。値の長さは{3}です。" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 @@ -2626,5 +2862,6 @@ #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "ウェイ {1} のうち{0}ノードが、最大許容数を越えました。最大許容数は {2} です。" +msgstr "" +"ウェイ {1} のうち{0}ノードが、最大許容数を越えました。最大許容数は {2} です。" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2639,6 +2876,7 @@ "dependency." msgstr "" -"{0} リレーションが相互に参照しあっており、循環を形成しています。
JOSM " -"はこれをアップロードできません。リレーションを編集して相互依存を解消してください。" +"{0} リレーションが相互に参照しあっており、循環を形成しています。" +"
JOSM はこれをアップロードできません。リレーションを編集して相互依存を解消" +"してください。" #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53 @@ -2748,9 +2986,9 @@ "conflict can't be added." msgstr "" -"レイヤー ''{0}'' " -"は、既にプリミティブ
''{1}''
で、競合しています。この競合は加えることができません。" +"レイヤー ''{0}'' は、既にプリミティブ
''{1}''
で、競合していま" +"す。この競合は加えることができません。" #: ../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 "二重の競合" @@ -2761,5 +2999,7 @@ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitive ''{1}''." -msgstr "警告: レイヤー ''{0}'' は既に存在しません。元の ''{1}'' への競合は取り除けません。" +msgstr "" +"警告: レイヤー ''{0}'' は既に存在しません。元の ''{1}'' への競合は取り除けま" +"せん。" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 @@ -2769,9 +3009,12 @@ #: ../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 "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないからです。" +msgstr "" +"コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないから" +"です。" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 @@ -2786,19 +3029,23 @@ msgstr "未決の競合を解決できません" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 +#: ../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 "パラメータ ''{0}'' は空ではダメです" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61 +#: ../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:107 +msgstr "" +"削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取り" +"ました" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 msgid "At least one object to delete requird, got empty collection" -msgstr "削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取りました" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 +msgstr "" +"削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取り" +"ました" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177 #, java-format msgid "Delete {0} object" @@ -2806,5 +3053,5 @@ msgstr[0] "{0} のオブジェクトを削除" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2812,5 +3059,5 @@ msgstr[0] "{0} のノードを削除" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2818,5 +3065,5 @@ msgstr[0] "{0} のウェイを削除" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2826,15 +3073,16 @@ #. 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 "削除確認" @@ -2851,22 +3099,24 @@ msgstr[0] "{0} のノードを移動" -#: ../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 "オブジェクト ''{0}'' を取り除いた。" -#: ../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 "{0} 個のオブジェクトを取り除いた。" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154 #, java-format msgid "" "Warning: Purging way {0} because number of nodes dropped below 2. Current is " "{1}" -msgstr "警告: ウェイ内のノードの数が2を下回ったので、ウェイ {0}を破棄します。現在は、{1} です。" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +msgstr "" +"警告: ウェイ内のノードの数が2を下回ったので、ウェイ {0}を破棄します。現在は、" +"{1} です。" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 #, java-format msgid "Removing reference from relation {0}" @@ -2877,9 +3127,4 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "リレーション {0} のメンバーリスト内の競合を解決" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -2957,9 +3202,11 @@ 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 " "its nodes are suggested in order to maintain data consistency." -msgstr "このウェイを反転するならば、データの一貫性を保つため、ウェイとそのノードのプロパティーに対する以下の変更が推奨されます。" +msgstr "" +"このウェイを反転するならば、データの一貫性を保つため、ウェイとそのノードのプ" +"ロパティーに対する以下の変更が推奨されます。" #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 @@ -3052,5 +3299,7 @@ "Warning: Failed to initialize preferences. Preference directory ''{0}'' " "isn't a directory." -msgstr "警告: 設定の初期化に失敗しました。設定ディレクトリ ''{0}'' はディレクトリではありません。" +msgstr "" +"警告: 設定の初期化に失敗しました。設定ディレクトリ ''{0}'' はディレクトリでは" +"ありません。" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 @@ -3059,5 +3308,7 @@ "Failed to initialize preferences.
Preference directory ''{0}'' " "isn't a directory." -msgstr "設定の初期化に失敗しました。
設定ディレクトリ ''{0}'' はディレクトリではありません。" +msgstr "" +"設定の初期化に失敗しました。
設定ディレクトリ ''{0}'' はディレクトリ" +"ではありません。" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 @@ -3066,5 +3317,6 @@ "Warning: Failed to initialize preferences. Failed to create missing " "preference directory: {0}" -msgstr "警告: 設定を初期化するのに失敗しました。作成に失敗した設定ディレクトリ: {0}" +msgstr "" +"警告: 設定を初期化するのに失敗しました。作成に失敗した設定ディレクトリ: {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 @@ -3073,5 +3325,7 @@ "Failed to initialize preferences.
Failed to create missing " "preference directory: {0}" -msgstr "設定を初期化するのに失敗しました。
作成に失敗した設定ディレクトリ: {0}" +msgstr "" +"設定を初期化するのに失敗しました。
作成に失敗した設定ディレクトリ: " +"{0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 @@ -3079,5 +3333,7 @@ msgid "" "Warning: Missing preference file ''{0}''. Creating a default preference file." -msgstr "警告: 設定ファイル ''{0}'' がありません。デフォルトの設定ファイルを作成します。" +msgstr "" +"警告: 設定ファイル ''{0}'' がありません。デフォルトの設定ファイルを作成しま" +"す。" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 @@ -3086,5 +3342,6 @@ "Warning: Replacing existing preference file ''{0}'' with default preference " "file." -msgstr "警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。" +msgstr "" +"警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 @@ -3093,14 +3350,16 @@ "Failed to initialize preferences.
Failed to reset preference file " "to default: {0}" -msgstr "設定の初期化に失敗しました。
設定ファイルをデフォルト: {0} にリセットできません" +msgstr "" +"設定の初期化に失敗しました。
設定ファイルをデフォルト: {0} にリセッ" +"トできません" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" -"Preferences file had errors.
Making backup of old one to " -"
{0}
and creating a new default preference file." -msgstr "" -"設定ファイルにはエラーがあります。
古いもののバックアップを
{0}
に取って、新しい初期設定ファイルを作ります。" +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." +msgstr "" +"設定ファイルにはエラーがあります。
古いもののバックアップを
{0}" +"
に取って、新しい初期設定ファイルを作ります。" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 @@ -3109,5 +3368,7 @@ "Warning: Failed to initialize preferences.Failed to reset preference file to " "default: {0}" -msgstr "警告: 設定の初期化に失敗しました。設定ファイルのデフォルト: {0} へのリセットに失敗" +msgstr "" +"警告: 設定の初期化に失敗しました。設定ファイルのデフォルト: {0} へのリセット" +"に失敗" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 @@ -3153,5 +3414,7 @@ "Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " "{1}" -msgstr "''{0}'' からのブックマークのロードはセキュリティ上の理由で失敗しました。例外の内容: {1}" +msgstr "" +"''{0}'' からのブックマークのロードはセキュリティ上の理由で失敗しました。例外" +"の内容: {1}" #: ../core/src/org/openstreetmap/josm/data/Version.java:46 @@ -3182,5 +3445,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3189,5 +3452,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3195,25 +3458,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 @@ -3236,25 +3499,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}" @@ -3262,6 +3526,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 "" @@ -3324,24 +3588,24 @@ msgstr "F" -#: ../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 "ID >= 0 である必要があります。 {0} を受け取りました" -#: ../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 "id=0 のプリミティブは非表示にできません" -#: ../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 "ID > 0 である必要があります。 {0} を受け取りました" -#: ../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 "バージョン > 0 である必要があります。 {0} を受け取りました" -#: ../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 " @@ -3349,5 +3613,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 "" @@ -3358,5 +3622,6 @@ #, java-format msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''." -msgstr "パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りました" +msgstr "" +"パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りました" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:48 @@ -3364,5 +3629,7 @@ #, java-format msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''." -msgstr "パラメータ ''{0}'' は受け入れ可能なクラスではありません、 ''{1}'' を受け取りました" +msgstr "" +"パラメータ ''{0}'' は受け入れ可能なクラスではありません、 ''{1}'' を受け取り" +"ました" #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572 @@ -3373,5 +3640,7 @@ "Tag collection can't be applied to a primitive because there are keys with " "multiple values." -msgstr "タグコレクションをプリミティブに適用できません。複数の値を持つキーがあります。" +msgstr "" +"タグコレクションをプリミティブに適用できません。複数の値を持つキーがありま" +"す。" #: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 @@ -3379,6 +3648,6 @@ msgstr "同じuidで異なる名前のユーザが見つかりました" -#: ../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}." @@ -3396,8 +3665,8 @@ #, java-format msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''." -msgstr "パラメータ {0} は 0..{1} の範囲内である必要があります、 {2} を受け取りました" +msgstr "" +"パラメータ {0} は 0..{1} の範囲内である必要があります、 {2} を受け取りました" #: ../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 @@ -3409,6 +3678,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 "ID ''{0}'' のプリミティブとID ''{1}'' のプリミティブを比較できません。" @@ -3419,135 +3687,135 @@ msgstr "パラメータ {0} は 0..{1} の範囲外です、 {2} を受け取りました" -#: ../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 "二つ以上の\"from\"ウェイがあります。" -#: ../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 "二つ以上の\"to\"ウェイがあります。" -#: ../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 "\"from\"ウェイが見つかりません" -#: ../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 "\"to\"ウェイが見つかりません" -#: ../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 "\"from\"ウェイは、\"via\"ノードで開始または終了していません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../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 "\"to\"のウェイは\"via\"のノードで始まったり終わったりしません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "\"from\" のウェイは\"via\"のウェイで始まったり終わったりしません。" -#: ../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 "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。" -#: ../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 "制約条件{0}のスタイルがありません。" -#: ../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 "ウェイ \"{0}\"と\"{1}\"の交差する点" -#: ../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 "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。" -#: ../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 "マルチポリゴンにウェイではない\"{0}\"があります。" -#: ../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 "マルチポリゴン用の外側のウェイが ''{0}'' にありません。" -#: ../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 "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。" -#: ../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 "外側のウェイ ''{0}''のスタイルが合いません。" -#: ../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 "Error: {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}" @@ -3559,5 +3827,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 @@ -3574,5 +3842,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 @@ -3591,5 +3859,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 "背景" @@ -3707,7 +3975,7 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 #, java-format -msgid "" -"Could not read bookmarks from
''{0}''
Error was: {1}" -msgstr "''{0}''
からブックマークが読み込めません
エラー内容: {1}" +msgid "Could not read bookmarks from
''{0}''
Error was: {1}" +msgstr "" +"''{0}''
からブックマークが読み込めません
エラー内容: {1}" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78 @@ -3721,5 +3989,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 @@ -3727,32 +3995,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" @@ -3760,5 +4028,5 @@ msgstr[0] "{0}ノード" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -3864,5 +4132,7 @@ "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " "filename" -msgstr "それぞれをダウンロード。x1,y1,x2,y2や、lat=y&lon=x&zoom=z を含むURLか、ファイル名を指定できます。" +msgstr "" +"それぞれをダウンロード。x1,y1,x2,y2や、lat=y&lon=x&zoom=z を含むURLか、ファイ" +"ル名を指定できます。" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 @@ -3871,5 +4141,6 @@ "lat=y&lon=x&zoom=z or a filename" msgstr "" -"それぞれを生GPSとしてダウンロード。x1,y1,x2,y2を、lat=y&lon=x&zoom=zを含むURLかファイル名で指定できます。" +"それぞれを生GPSとしてダウンロード。x1,y1,x2,y2を、lat=y&lon=x&zoom=zを含むURL" +"かファイル名で指定できます。" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 @@ -3877,5 +4148,7 @@ "Add each to the initial selection. Can be a google-like search string or an " "URL which returns osm-xml" -msgstr "それぞれを初期の選択として追加します。グーグルのような検索文字列やOSM-XMLを返すURLで指定できます。" +msgstr "" +"それぞれを初期の選択として追加します。グーグルのような検索文字列やOSM-XMLを返" +"すURLで指定できます。" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 @@ -3963,5 +4236,6 @@ " Java option to increase the maximum size of allocated memory" msgstr "" -"通知: いくつかのタスクで、JOSMに は多くのメモリが必要です。下記の追加が必要です\n" +"通知: いくつかのタスクで、JOSMに は多くのメモリが必要です。下記の追加が必要で" +"す\n" " Javaの使用メモリ最大サイズを増やすオプション" @@ -4003,12 +4277,12 @@ msgstr "設定 {0} はもう使われていないので、除かれました。" -#: ../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 @@ -4022,19 +4296,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 @@ -4045,5 +4319,5 @@ msgstr "メニュー: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "音声" @@ -4087,39 +4361,41 @@ 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 " "this list with the mouse.
" -msgstr "繰り返すには再び真中をクリックしてください。
CTRL キーを押しつづけるとマウスでこの表から直接選べます。" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +msgstr "" +"繰り返すには再び真中をクリックしてください。
CTRL キーを押しつづけるとマ" +"ウスでこの表から直接選べます。" + +#: ../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 "ユーザ:" @@ -4166,6 +4442,6 @@ "relation." msgstr "" -"1 オブジェクト を1 リレーション " -"から削除して良いか確認してください。" +"1 オブジェクト を1 リレーション から" +"削除して良いか確認してください。" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 @@ -4176,6 +4452,6 @@ "relations." msgstr "" -"1 オブジェクト を{0} リレーション " -"から削除して良いか確認してください。" +"1 オブジェクト を{0} リレーション か" +"ら削除して良いか確認してください。" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 @@ -4230,5 +4506,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" @@ -4237,5 +4513,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" @@ -4244,5 +4520,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" @@ -4261,5 +4537,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 @@ -4276,5 +4552,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" @@ -4302,5 +4578,7 @@ msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" -msgstr "結合されたノードリストを固定しました。このウェイのノードリストには保留中の競合はありません。" +msgstr "" +"結合されたノードリストを固定しました。このウェイのノードリストには保留中の競" +"合はありません。" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 @@ -4320,5 +4598,7 @@ "Merged member list frozen. No pending conflicts in the member list of this " "relation" -msgstr "結合されたメンバーリストを固定しました。このリレーションのメンバーリストには保留中の競合はありません。" +msgstr "" +"結合されたメンバーリストを固定しました。このリレーションのメンバーリストには" +"保留中の競合はありません。" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 @@ -4346,22 +4626,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 "現在のパラメータは範囲外です: {0} を受け取りました" -#: ../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 "ロール {0} のリストは現在比較ペアに参加していません" -#: ../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 "パラメータ \"index\" に予期せぬ値。入力値: {0}" -#: ../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." @@ -4395,5 +4675,7 @@ "List of merged elements. They will replace the my elements when the merge " "decisions are applied." -msgstr "結合した要素のリスト。結合が適用されると、あなたの編集した要素は置き換えられるでしょう。" +msgstr "" +"結合した要素のリスト。結合が適用されると、あなたの編集した要素は置き換えられ" +"るでしょう。" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 @@ -4426,5 +4708,6 @@ "Copy my selected elements before the first selected element in the list of " "merged elements." -msgstr "選択した要素を、結合された要素リストから選択している最初の要素の前にコピー" +msgstr "" +"選択した要素を、結合された要素リストから選択している最初の要素の前にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 @@ -4432,5 +4715,6 @@ "Copy my selected elements after the first selected element in the list of " "merged elements." -msgstr "選択した要素を、結合された要素リストから選択している最初の要素の後にコピー" +msgstr "" +"選択した要素を、結合された要素リストから選択している最初の要素の後にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 @@ -4440,6 +4724,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 "相手の選択した要素を、結合された要素リストの最後にコピー" @@ -4448,5 +4731,6 @@ "Copy their selected elements before the first selected element in the list " "of merged elements." -msgstr "相手の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー" +msgstr "" +"相手の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 @@ -4454,5 +4738,6 @@ "Copy their selected element after the first selected element in the list of " "merged elements" -msgstr "相手の選択した要素を、結合された要素リストの最初に選択された要素の後にコピー" +msgstr "" +"相手の選択した要素を、結合された要素リストの最初に選択された要素の後にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 @@ -4508,14 +4793,18 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." -msgstr "{0} をクリックして自分と相手のエントリの結合を開始" +"Click {0} to start merging my and their entries." +msgstr "" +"{0} をクリックして自分と相手のエントリの結合を開始" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." -msgstr "{0} をクリックして自分と相手のエントリの結合を完了" +"Click {0} to finish merging my and their entries." +msgstr "" +"{0} をクリックして自分と相手のエントリの結合を完了" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 @@ -4543,5 +4832,6 @@ "Adjustable {0} not registered yet. Can't set participation in synchronized " "adjustment." -msgstr "調整可能な {0} がまだ登録されていません。同期された調整に参加設定できません。" +msgstr "" +"調整可能な {0} がまだ登録されていません。同期された調整に参加設定できません。" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 @@ -4568,6 +4858,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 "サーバとの通信中にエラー発生
詳細: {0}" @@ -4592,6 +4882,6 @@ "the server.

Do you want to undelete these nodes too?" msgstr "" -"サーバーから削除されたウェイ{1}に
付加された {0} " -"個のノードがあります。

これらのノードも復活させたいですか?" +"サーバーから削除されたウェイ{1}に
付加された {0} 個のノードがありま" +"す。

これらのノードも復活させたいですか?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 @@ -4602,10 +4892,10 @@ #, java-format msgid "" -"There are {0} additional primitives referred to by relation " -"{1}
which are deleted on the server.

Do you want to undelete them " -"too?" -msgstr "" -"サーバーから削除されたリレーション{1}に
参照されていた {0} " -"個のプリミティブがあります。

これらも復活させたいですか?" +"There are {0} additional primitives referred to by relation {1}" +"
which are deleted on the server.

Do you want to undelete them too?" +"" +msgstr "" +"サーバーから削除されたリレーション{1}に
参照されていた {0} 個のプリ" +"ミティブがあります。

これらも復活させたいですか?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 @@ -4621,5 +4911,7 @@ "Properties in the merged element. They will replace properties in my " "elements when merge decisions are applied." -msgstr "結合された要素のプロパティ。結合する決定が適用された時、相手は自分の要素のプロパティを置換します。" +msgstr "" +"結合された要素のプロパティ。結合する決定が適用された時、相手は自分の要素のプ" +"ロパティを置換します。" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91 @@ -4717,6 +5009,7 @@ "yo agree?" msgstr "" -"あなたのローカルバージョンを残すために、JOSMは
プリミティブ {0} のID " -"を0にリセットしなければなりません。
次回のアップロード時にサーバが新しいidを割り当てます。
よろしいですか？" +"あなたのローカルバージョンを残すために、JOSMは
プリミティブ {0} の" +"ID を0にリセットしなければなりません。
次回のアップロード時にサーバが新し" +"いidを割り当てます。
よろしいですか？" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 @@ -4738,6 +5031,6 @@ "dataset.
Do you agree?" msgstr "" -"JOSM はid {0} " -"のあなたのローカルプリミティブをデータセットから
削除しなければなりません。
よろしいですか？" +"JOSM はid {0} のあなたのローカルプリミティブをデータセットから
削除" +"しなければなりません。
よろしいですか？" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 @@ -4754,5 +5047,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 "結合したノードはまだ固定されていません。解決コマンドをビルドできません" @@ -4819,5 +5112,6 @@ #, java-format msgid "Parameter 'col' must be 0 or 1. Got {0}." -msgstr "パラメータ 'col' は0 または 1でなければなりません。{0} を受け取りました" +msgstr "" +"パラメータ 'col' は0 または 1でなければなりません。{0} を受け取りました" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126 @@ -4887,5 +5181,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 "適用" @@ -4933,5 +5227,7 @@ #, java-format msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}." -msgstr "タグのパラメーター ''{0}'' は、厳格に1つのキーであることが期待されています。 {1} を受けとりました。" +msgstr "" +"タグのパラメーター ''{0}'' は、厳格に1つのキーであることが期待されています。 " +"{1} を受けとりました。" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 @@ -4984,7 +5280,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" @@ -4993,6 +5289,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" @@ -5025,7 +5321,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 "ロール:" @@ -5043,5 +5337,7 @@ "Select to enable entering a tag which will be applied
to all " "modified relations." -msgstr "選択してタグの入力を有効化。全ての変更されたリレーションに
適用されます。" +msgstr "" +"選択してタグの入力を有効化。全ての変更されたリレーションに
適用され" +"ます。" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106 @@ -5052,5 +5348,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108 msgid "Enter a tag key, i.e. fixme" -msgstr "タグキーを入力してください、例）fixme" +msgstr "" +"タグキーを入力してください、例）fixme" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 @@ -5061,5 +5358,7 @@ msgid "" "Enter a tag value, i.e. check members" -msgstr "タグの値を入力してください、例）check members" +msgstr "" +"タグの値を入力してください、例）check members" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123 @@ -5114,5 +5413,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 @@ -5177,10 +5476,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 "" @@ -5255,18 +5553,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 @@ -5276,13 +5574,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 "選択したオブジェクトの履歴を表示。" @@ -5290,5 +5588,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84 msgid "Dialog not created yet. Invoke createInstance() first" -msgstr "ダイアログはまだ作成されていません。最初に createInstance() を呼び出してください" +msgstr "" +"ダイアログはまだ作成されていません。最初に createInstance() を呼び出してくだ" +"さい" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145 @@ -5473,5 +5773,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 "このリレーションのコピーを作成し、他の編集ウィンドウで開く" @@ -5514,30 +5814,32 @@ 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 +msgstr "" +"このパネルを閉じます。左側のツールバーのボタンを使うことで再度開くことができ" +"ます。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371 msgid "Click to minimize/maximize the panel content" msgstr "クリックすることでパネルの内容を最小化/最大化" @@ -5575,5 +5877,6 @@ msgid "" "Warning: only launching info browsers for the first {0} of {1} selected users" -msgstr "警告: 選択されたユーザ {1} のうち、最初の {0} だけに情報ブラウザを起動します" +msgstr "" +"警告: 選択されたユーザ {1} のうち、最初の {0} だけに情報ブラウザを起動します" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 @@ -5582,5 +5885,7 @@ "Failed to create an URL because the encoding ''{0}'' was
was " "missing on this system." -msgstr "URL の作成に失敗しました。エンコーディング ''{0}''は
このシステムにはありません。" +msgstr "" +"URL の作成に失敗しました。エンコーディング ''{0}''は
このシステムに" +"はありません。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 @@ -5596,106 +5901,136 @@ 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 "" "The child relation
{0}
is deleted on the server. It can't be " "loaded" -msgstr "子リレーション
{0}
はサーバ上から削除されました。ロードできません" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:352 +msgstr "" +"子リレーション
{0}
はサーバ上から削除されました。ロードできません" + +#: ../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 "リレーション {0} をダウンロード中" -#: ../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 "警告: タククがキャンセルされたために例外を無視します。例外: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +#: ../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] "リレーション''{0}'' をダウンロード中" + +#: ../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 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "リレーション''{0}'' をダウンロード中" + +#: ../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:160 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 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 "" -"このリレーションには既にひとつ以上の
プリミティブ ''{0}'' " -"
を参照しているメンバーがあります。
本当に他のリレーションメンバーを追加しますか？" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 +"primitive ''{0}''

Do you really want to add another relation member?" +msgstr "" +"このリレーションには既にひとつ以上の
プリミティブ ''{0}''
を参照" +"しているメンバーがあります。
本当に他のリレーションメンバーを追加します" +"か？" + +#: ../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 "" @@ -5704,113 +6039,124 @@ "''{0}''." msgstr "" -"リレーション自身に追加しようとしています。

これは循環参照を引き起こすので薦められません。
リレーション ''{0}'' " -"をスキップします。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 +"リレーション自身に追加しようとしています。

これは循環参照を引き" +"起こすので薦められません。
リレーション ''{0}'' をスキップします。" + +#: ../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 +msgstr "" +"現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加" + +#: ../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 +msgstr "" +"現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714 msgid "" "Add all primitives selected in the current dataset before the first selected " "member" -msgstr "現在のデータセット内で選択された全プリミティブを最初に選択されたメンバーの前に追加" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 +msgstr "" +"現在のデータセット内で選択された全プリミティブを最初に選択されたメンバーの前" +"に追加" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748 msgid "" "Add all primitives selected in the current dataset after the last selected " "member" -msgstr "現在のデータセット内で選択された全プリミティブを最後に選択されたメンバーの後に追加" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 +msgstr "" +"現在のデータセット内で選択された全プリミティブを最後に選択されたメンバーの後" +"に追加" + +#: ../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 "" "Select relation members which refer to {0} primitives in the current " "selection" -msgstr "現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +msgstr "" +"現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択" + +#: ../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:1056 +#: ../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:1063 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5818,58 +6164,65 @@ "conflict and close the editor?" 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 "" -"レイヤー ''{0}''には既にプリミティブ ''{1}'' " -"
に競合があります。
最初にこの競合を解決してからやり直してください。" - -#: ../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 "" +"レイヤー ''{0}''には既にプリミティブ ''{1}''
に競合があります。
" +"最初にこの競合を解決してからやり直してください。" + +#: ../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" -msgstr "リレーション中の全ての不完全なウェイとノードをダウンロード" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../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: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 +#, fuzzy +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 "" @@ -5878,44 +6231,37 @@ "new role?" msgstr "" -"空のロールを {0} " -"プリミティブにセットしようとしています。
これはロールを削除することになります。
新しいロールを本当に適用しますか？" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +"空のロールを {0} プリミティブにセットしようとしています。
これはロー" +"ルを削除することになります。
新しいロールを本当に適用しますか？" + +#: ../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 "リレーション''{0}'' をダウンロード中" - -#: ../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 "選択されたメンバーが無いのでズームは無効化されました" @@ -5955,19 +6301,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 "レイヤー ''{0}'' に新しいリレーションを作成" -#: ../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 "レイヤー ''{0}'' の新しいリレーションを編集" -#: ../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}''" @@ -5979,6 +6325,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 "警告: タスクがキャンセルされたので例外を無視。例外: " @@ -6025,5 +6370,7 @@ msgid "" "Currently, there is no download area selected. Please select an area first." -msgstr "現在はダウンロードエリアが選択されていません。最初にエリアを選択してください。" +msgstr "" +"現在はダウンロードエリアが選択されていません。最初にエリアを選択してくださ" +"い。" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 @@ -6065,5 +6412,7 @@ "URL from www.openstreetmap.org (you can paste an URL here to download the " "area)" -msgstr "www.openstreetmap.orgからのURL（ダウンロードしたいエリアのURLをここに貼り付けることができます。）" +msgstr "" +"www.openstreetmap.orgからのURL（ダウンロードしたいエリアのURLをここに貼り付け" +"ることができます。）" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 @@ -6156,7 +6505,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 "" @@ -6929,5 +7277,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 @@ -7121,6 +7469,7 @@ "Hold left mousebutton and draw a frame." msgstr "" -"ズーム: マウスホイール、ダブルクリックまたは Ctrl + Up/Down マップを移動: " -"右クリックしたままマウスを移動またはカーソルキーを使用。選択: 左クリックしたままフレームをドロー。" +"ズーム: マウスホイール、ダブルクリックまたは Ctrl + Up/Down マップ" +"を移動: 右クリックしたままマウスを移動またはカーソルキーを使用。選択:" +" 左クリックしたままフレームをドロー。" #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123 @@ -7168,6 +7517,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 "" @@ -7177,6 +7526,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 "" @@ -7286,5 +7635,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 msgid "History not initialized yet. Failed to set reference primitive." -msgstr "履歴はまだ初期化されていません。参照プリミティブのセットに失敗しました。" +msgstr "" +"履歴はまだ初期化されていません。参照プリミティブのセットに失敗しました。" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 @@ -7310,5 +7660,6 @@ "Failed to set current primitive. Current version {0} not available in " "history." -msgstr "現在のプリミティブの設定に失敗。現在のバージョン {0} は履歴で使用できません。" +msgstr "" +"現在のプリミティブの設定に失敗。現在のバージョン {0} は履歴で使用できません。" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:52 @@ -7433,5 +7784,6 @@ msgid "" "Version {0} created on {1}" -msgstr "バージョン {0} 作成日 {1}" +msgstr "" +"バージョン {0} 作成日 {1}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 @@ -7439,13 +7791,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}" @@ -7546,7 +7898,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format -msgid "" -"Layer ''{0}'' has modifications which should be uploaded to the server." -msgstr "レイヤー ''{0}'' は修正されていますのでサーバにアップロードしてください。" +msgid "Layer ''{0}'' has modifications which should be uploaded to the server." +msgstr "" +"レイヤー ''{0}'' は修正されていますのでサーバにアップロードしてください。" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 @@ -7560,5 +7912,6 @@ "Layer ''{0}'' has modifications which should be saved to its associated file " "''{1}''." -msgstr "レイヤー ''{0}'' にはその関連ファイル ''{1}'' に保存すべき修正があります。" +msgstr "" +"レイヤー ''{0}'' にはその関連ファイル ''{1}'' に保存すべき修正があります。" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 @@ -7583,5 +7936,6 @@ #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." -msgstr "ファイル ''{0}'' には書き込めません。他のファイル名を入力してください。" +msgstr "" +"ファイル ''{0}'' には書き込めません。他のファイル名を入力してください。" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 @@ -7617,5 +7971,6 @@ "discard the modifications.
Layers with conflicts:" msgstr[0] "" -"{0} レイヤーに未解決の競合があります。
最初に解決するか修正を破棄してください。
競合のあるレイヤー:" +"{0} レイヤーに未解決の競合があります。
最初に解決するか修正を破棄し" +"てください。
競合のあるレイヤー:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 @@ -7630,10 +7985,10 @@ 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] "" -"{0} " -"レイヤーは保存が必要ですが関連するファイルがありません。
このレイヤー用のファイルを選択するか変更を破棄してください。
ファイルの無いレイヤー" -":" +"{0} レイヤーは保存が必要ですが関連するファイルがありません。
このレ" +"イヤー用のファイルを選択するか変更を破棄してください。
ファイルの無いレイ" +"ヤー:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 @@ -7645,6 +8000,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 " @@ -7652,7 +8007,7 @@ "changes.
Layers with non-writable files:" msgstr[0] "" -"{0} " -"レイヤーは保存が必要ですが
書き込み不可の
関連するファイルがあります。
このレイヤー用の他のファイルを選択するか変更を破棄してください" -"。
書き込み不可のファイルのあるレイヤー:" +"{0} レイヤーは保存が必要ですが
書き込み不可の
関連するファイルが" +"あります。
このレイヤー用の他のファイルを選択するか変更を破棄してくださ" +"い。
書き込み不可のファイルのあるレイヤー:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 @@ -7701,11 +8056,13 @@ msgstr "レイヤー ''{0}'' のアップロード準備中 ..." -#: ../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 " "cancelled or has failed." -msgstr "変更したレイヤのアップロードまたは保存の作業は
キャンセルされたか失敗しました。" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491 +msgstr "" +"変更したレイヤのアップロードまたは保存の作業は
キャンセルされたか失" +"敗しました。" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492 msgid "Incomplete upload and/or save" msgstr "不完全なアップロードと保存" @@ -7778,40 +8135,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:" @@ -7819,5 +8176,5 @@ msgstr[0] "{0} 個のオブジェクトを加えてください:" -#: ../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:" @@ -7826,5 +8183,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:" @@ -7832,68 +8189,67 @@ msgstr[0] "{0} 個のオブジェクトを削除:" -#: ../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 "このアップロード変更セットにコメントを入力してください（3文字以上）" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 msgid "Enter an upload comment (min. 3 characters)" msgstr "アップロード用コメントを入力(最小3文字)" -#: ../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}" @@ -7901,16 +8257,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}." @@ -7918,13 +8274,15 @@ #. 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 "" "Warning: primitive ''{0}'' is already deleted on the server. Skipping this " "primitive and retrying to upload." -msgstr "警告: プリミティブの ''{0}'' は既にサーバから削除されています。このプリミティブをスキップし、アップロードを再試行します。" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105 +msgstr "" +"警告: プリミティブの ''{0}'' は既にサーバから削除されています。このプリミ" +"ティブをスキップし、アップロードを再試行します。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112 msgid "Preparing primitives to upload ..." msgstr "プリミティブアップロード準備中" @@ -7934,5 +8292,7 @@ "Mark modified objects from the current selection to " "be uploaded to the server." -msgstr "現在の選択から修正されたオブジェクトをマークしてサーバにアップロード。" +msgstr "" +"現在の選択から修正されたオブジェクトをマークしてサーバ" +"にアップロード。" #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 @@ -7940,5 +8300,7 @@ "Mark locally deleted objects to be deleted on the " "server." -msgstr "ローカルで削除されたオブジェクトをマークしてサーバから削除。" +msgstr "" +"ローカルで削除されたオブジェクトをマークしてサーバから" +"削除。" #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 @@ -7954,110 +8316,57 @@ 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}×{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 "GPS開始: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "GPS終了: {0}" - -#: ../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] "画像" - -#: ../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 "JPEGイメージ(*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "ファイル \"{0}\"中の日付が取得できません。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。" - -#: ../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 "写真の日付を入力(mm/dd/yyyy HH:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "GPSユニットのタイムゾーン(写真の時間との違い)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "時刻をGPSユニットと同期する" - -#: ../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 +#, fuzzy, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "警告: プレセットの設定を ''{0}''とするのに失敗しました。" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 +#, fuzzy +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 +#, fuzzy +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} メータ" + +#: ../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 +#, fuzzy, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "" +"ファイル ''{0}'' には書き込めません。他のファイル名を入力してください。" + +#: ../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 @@ -8065,30 +8374,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 @@ -8096,5 +8405,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 @@ -8103,5 +8412,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 @@ -8110,58 +8419,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 "{0} からの名前付きトラックポイント" -#: ../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音声ファイル(*.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 "JPEGイメージ(*.jpg)" + +#: ../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 @@ -8169,5 +8483,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" @@ -8176,5 +8490,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 @@ -8182,22 +8496,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 "URL" - -#: ../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, " @@ -8205,5 +8514,5 @@ msgstr[0] "{0}ルート, " -#: ../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" @@ -8211,24 +8520,25 @@ msgstr[0] "{0} ウェイポイント" -#: ../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 "" -"マップデータとして加工されていないGPSデータをアップロードすることは、有害だと考えられています。
もしトレースをアップロードしたいなら" -"ば、ここを見てください：" - -#: ../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 "" +"マップデータとして加工されていないGPSデータをアップロードすることは、有" +"害だと考えられています。
もしトレースをアップロードしたいならば、ここを見" +"てください：" + +#: ../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 @@ -8238,70 +8548,76 @@ 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 "このトラックに沿ってOSMからダウンロード" -#: ../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 "" "This action will require {0} individual
download requests. Do you " "wish
to continue?" -msgstr "この操作には、{0}この独立したダウンロード要求を
必要とします。続けますか？" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 +msgstr "" +"この操作には、{0}この独立したダウンロード要求を
必要とします。続けま" +"すか？" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 msgid "No GPX track available in layer to associate audio with." msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。" -#: ../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 " "the end were omitted or moved to the start." -msgstr "トラックの開始以前又は終了以後のタイムスタンプがあるウェイポイントは、開始点に変更又は移動されました。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249 +msgstr "" +"トラックの開始以前又は終了以後のタイムスタンプがあるウェイポイントは、開始点" +"に変更又は移動されました。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " "time were omitted." -msgstr "ウェイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除外します。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 +msgstr "" +"ウェイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除" +"外します。" + +#: ../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 "バージョン {0}" -#: ../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 "警告 : バージョン 0.5 に 0.5 と 0.6 のデータが混ざっている" -#: ../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." @@ -8309,5 +8625,5 @@ msgstr[0] "検出された競合が {0} 個あります" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 #, java-format msgid "" @@ -8321,5 +8637,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 "" @@ -8332,11 +8648,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" @@ -8344,32 +8660,32 @@ msgstr[0] "{0} を削除しました" -#: ../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 "APIバージョン: {0}" -#: ../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 "GPXレイヤーの変換" -#: ../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:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 msgid "No problems found" msgstr "問題はありませんでした" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 msgid "Following problems found:" msgstr "次の問題が見つかりました:" @@ -8377,9 +8693,10 @@ #: ../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:" -msgstr "" -"処理していない GPS " -"データを地図データとしてアップロードすることは有害だと考えられる。
もし、トレースデータをアップロードしたいなら、コチラを見よ :" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" +msgstr "" +"処理していない GPS データを地図データとしてアップロードすることは有害だ" +"と考えられる。
もし、トレースデータをアップロードしたいなら、コチラを見" +"よ :" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 @@ -8412,4 +8729,361 @@ msgstr[0] "{0} ポイント" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "GPXファイル(*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "ファイル {0} は、\"{1}\"という名前でですが、読み込まれました。" + +#: ../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 "" +" 使用しているGPSレシーバーの、時刻を表示しているところの写真をとりま" +"す。
その写真をここに表示してください。
そして写真に表示されている時刻" +"を読み取って、タイムゾーンを選択します。
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "写真の時刻(exifから取得):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "(写真から読み取った)GPSの時刻: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [dd/mm/yyyy hh:mm:ss]" + +#: ../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 "GPSレシーバーの写真から時刻を同期" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"日付時刻の解釈時にエラーになりました。\n" +"入力する形式を確認してください。" + +#: ../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 "GPXトラック: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "ほかのGPXトレースを開く" + +#: ../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 "" +"私のGPSレシーバーは写真を撮ることができます。
これは使えますか。" + +#: ../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 "exif位置のついていない画像" + +#: ../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 "GPXトラックに画像を関連づけます。" + +#: ../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 "GPXトラックを選択しなければなりません" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "GPXトラックの選択がありません" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"タイムゾーンの解釈時にエラーになりました。\n" +"期待する形式: {0}" + +#: ../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 "" +"オフセット区切り作業中にエラーです。\n" +"期待されるフォーマット: {0}" + +#: ../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 "GPX トラック {2} に、{1}中に{0}枚発見しました。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "GPXトラックが読み込まれました" + +#: ../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 "" +"選択されたGPXトラックはタイムスタンプを含んでいません。他のGPXトラックを選択" +"してください。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "GPXトラックは、時間情報を持っていません。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "タイムゾーン: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "分: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "秒: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "{0}／{1} 枚の写真がGPXトラックにマッチしました。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "(時差 {0} 日)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "トラックと写真の間には、時差があります。: {0}分 {1}秒" + +#: ../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 "" +"GPX トラックと写真の照合中にエラーが発生。スライダーを調整して写真と手動で照" +"合できます。" + +#: ../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 "EXIFからGPS位置を取得" + +#: ../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 "標準的なディレクトリへのパスを入手できません {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "ディレクトリ {0} を走査" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "ディレクトリ {0}に中身のないファイルが見つかりました\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "ディレクトリからファイルを入手中のエラー {0}\n" + +#: ../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 "GPXに関連づける" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "画像" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "{0} は gps タグがつけられていることがわかりました。" + +#: ../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 "{0} 読み込み中です" + +#: ../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 "ファイル{0}にエラー" + +#: ../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 "" +"\n" +"高度: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8434,5 +9108,7 @@ msgid "" "You need to pause audio at the moment when you hear your synchronization cue." -msgstr "あなたの同期用キューと同期させる瞬間に、オーディオを一時停止する必要があります。" +msgstr "" +"あなたの同期用キューと同期させる瞬間に、オーディオを一時停止する必要がありま" +"す。" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243 @@ -8473,5 +9149,7 @@ "You need to drag the play head near to the GPX track whose associated sound " "track you were playing (after the first marker)." -msgstr "再生ヘッドを、再生しているサウンドトラックに対応するGPXトラックの近くにドラッグする必要があります。" +msgstr "" +"再生ヘッドを、再生しているサウンドトラックに対応するGPXトラックの近くにドラッ" +"グする必要があります。" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226 @@ -8479,5 +9157,7 @@ "You need to SHIFT-drag the play head onto an audio marker or onto the track " "point where you want to synchronize." -msgstr "SHIFT+ドラッグで、再生開始点を合わせたいオーディオマーカの上か、トラックポイントの上に持ってくる必要があります。" +msgstr "" +"SHIFT+ドラッグで、再生開始点を合わせたいオーディオマーカの上か、トラックポイ" +"ントの上に持ってくる必要があります。" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241 @@ -8593,5 +9273,7 @@ "Display a moving icon representing the point on the synchronized track where " "the audio currently playing was recorded." -msgstr "現在再生されているオーディオが記録された場所と同期して、その点を示すアイコンを動かして表示する。" +msgstr "" +"現在再生されているオーディオが記録された場所と同期して、その点を示すアイコン" +"を動かして表示する。" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63 @@ -8599,5 +9281,7 @@ "Put text labels against audio (and image and web) markers as well as their " "button icons." -msgstr "ボタンアイコンと同様、オーディオ（と画像やWeb）のマーカーに対してテキストのラベルを付与する。" +msgstr "" +"ボタンアイコンと同様、オーディオ（と画像やWeb）のマーカーに対してテキストのラ" +"ベルを付与する。" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68 @@ -8605,5 +9289,7 @@ "Automatically make a marker layer from any waypoints when opening a GPX " "layer." -msgstr "自動的にマーカーレイヤーを、GPXレイヤーを開いたときにウェイポイントから作成する。" +msgstr "" +"自動的にマーカーレイヤーを、GPXレイヤーを開いたときにウェイポイントから作成す" +"る。" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71 @@ -8621,5 +9307,7 @@ "Automatically create audio markers from trackpoints (rather than explicit " "waypoints) with names or descriptions." -msgstr "（explicitウェイポイントではなく）自動的にトラックポイントからオーディオマーカーを作成し、名前と説明を付加する。" +msgstr "" +"（explicitウェイポイントではなく）自動的にトラックポイントからオーディオマー" +"カーを作成し、名前と説明を付加する。" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90 @@ -8627,5 +9315,7 @@ "Create audio markers at the position on the track corresponding to the " "modified time of each audio WAV file imported." -msgstr "インポートされたそれぞれのオーディオWAVファイルが変更された時間に対応したトラックの位置にオーディオマーカーを作成してください。" +msgstr "" +"インポートされたそれぞれのオーディオWAVファイルが変更された時間に対応したト" +"ラックの位置にオーディオマーカーを作成してください。" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99 @@ -8651,5 +9341,7 @@ "Playback starts this number of seconds before (or after, if negative) the " "audio track position requested" -msgstr "再生を、指定した秒数前の（マイナスの場合は秒数後の）オーディオトラック位置から開始する。" +msgstr "" +"再生を、指定した秒数前の（マイナスの場合は秒数後の）オーディオトラック位置か" +"ら開始する。" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110 @@ -8705,5 +9397,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 @@ -8731,5 +9423,7 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149 msgid "Draw a circle form HDOP value." -msgstr "HDOP（Horizontal Dilution of Precision: 垂直精度劣化度） の値の円を描いてください" +msgstr "" +"HDOP（Horizontal Dilution of Precision: 垂直精度劣化度） の値の円を描いてくだ" +"さい" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 @@ -8895,6 +9589,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 "数式演算ではなく、テーブル検索によって矢印の方向を決めて描画する。" @@ -8918,5 +9611,7 @@ "All points and track segments will have the same color. Can be customized in " "Layer Manager." -msgstr "全ての点とトラックセグメントは同じ色になります。レイヤー管理からカスタマイズ可能です。" +msgstr "" +"全ての点とトラックセグメントは同じ色になります。レイヤー管理からカスタマイズ" +"可能です。" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182 @@ -8929,5 +9624,6 @@ "capture device needs to logs that information." msgstr "" -"（水平）位置精度低下率（HDOP)によって、点とトラックセグメントの配色をおこなう。使用しているGPS機器がこの情報を記録している必要があります。" +"（水平）位置精度低下率（HDOP)によって、点とトラックセグメントの配色をおこな" +"う。使用しているGPS機器がこの情報を記録している必要があります。" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188 @@ -8954,6 +9650,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 "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。" @@ -8983,5 +9678,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32 msgid "When saving, keep backup files ending with a ~" -msgstr "保存時に、バックアップファイルを、ファイル名の末尾に~をつけてとっておく。" +msgstr "" +"保存時に、バックアップファイルを、ファイル名の末尾に~をつけてとっておく。" #. Show splash screen on startup @@ -9021,19 +9717,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 @@ -9292,6 +9988,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 "" @@ -9348,6 +10044,6 @@ "started. So you need to restart JOSM to see your changes.

" msgstr "" -"

ここで、ショートカットキーは、JOSMが開始したときに割り当てられます。したがって、JOSMを再起動するまでは、設定が反映されることは" -"ありません。

" +"

ここで、ショートカットキーは、JOSMが開始したときに割り当てられます。した" +"がって、JOSMを再起動するまでは、設定が反映されることはありません。

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:167 @@ -9356,9 +10052,11 @@ "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.

" -msgstr "" -"

さらに、ショートカットは、最初にアクションがボタンのメニュー項目に割り当てられたときに有効になります。したがって、この変更は再起動しても有効にならな" -"いかもしれません。また衝突を扱わない。これは、ここで変更したときにJOSMを再起動するもう一つの理由でもあります。

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

" +msgstr "" +"

さらに、ショートカットは、最初にアクションがボタンのメニュー項目に割り当て" +"られたときに有効になります。したがって、この変更は再起動しても有効にならない" +"かもしれません。また衝突を扱わない。これは、ここで変更したときにJOSMを再起" +"動するもう一つの理由でもあります。

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:170 @@ -9370,17 +10068,19 @@ "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...

" -msgstr "" -"

次ページのキー選択一覧は全種類のJava " -"が知りうるあらゆるキーボードをリストしており、あなたのキーボード上にあるキーではないことにご注意ください。あなたのキーボード上にある実際のキーに対応する値" -"だけを使用してください。もしあなたのキーボードに 'Copy' キーが無い場合 (PC キーボードにはありません、Sun " -"のキーボードにはあります)、使用しないでください。 また、あなたのキーボード上のショーツカットに対応するリストされた'key' もあります。(例： " -"':'/Colon)。これも同様に使わないでください。代わりにベースキー(US キーボードの';'/Semicolon 、ドイツキーボードの " -"'.'/Period 、...) を使ってください。そうしないと競合を引き起こす場合があります。JOSM には Ctrl+Shift+; and " -"Ctrl+: がUS キーボードでは実際には同じことだと知る手立てが無いのです...

" +"(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 "" +"

次ページのキー選択一覧は全種類のJava が知りうるあらゆるキーボードをリスト" +"しており、あなたのキーボード上にあるキーではないことにご注意ください。あなた" +"のキーボード上にある実際のキーに対応する値だけを使用してください。もしあなた" +"のキーボードに 'Copy' キーが無い場合 (PC キーボードにはありません、Sun のキー" +"ボードにはあります)、使用しないでください。 また、あなたのキーボード上の" +"ショーツカットに対応するリストされた'key' もあります。(例： ':'/Colon)。これ" +"も同様に使わないでください。代わりにベースキー(US キーボードの';'/" +"Semicolon 、ドイツキーボードの '.'/Period 、...) を使ってください。そうしない" +"と競合を引き起こす場合があります。JOSM には Ctrl+Shift+; and Ctrl+: がUS キー" +"ボードでは実際には同じことだと知る手立てが無いのです...

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177 @@ -9400,13 +10100,17 @@ "already taken, it will assign a random shortcut instead.

" msgstr "" -"

最終ページはJOSM が自動的にショートカットに割り当てる修飾を一覧表示しています。4種のショートカットごとに3つの代替案があります。JOSM " -"は競合を管理する際、リスト順にこれらの代替案を試します。全ての代替案が既に割り当てられたショートカットになった場合、代わりにランダムなショートカットを割り" -"当てます。

" +"

最終ページはJOSM が自動的にショートカットに割り当てる修飾を一覧表示してい" +"ます。4種のショートカットごとに3つの代替案があります。JOSM は競合を管理する" +"際、リスト順にこれらの代替案を試します。全ての代替案が既に割り当てられた" +"ショートカットになった場合、代わりにランダムなショートカットを割り当てます。" +"

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 msgid "" -"

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

" -msgstr "

擬似変更 'disabled' は、次に起こったときにショートカットを無効にします。

" +"

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

" +msgstr "" +"

擬似変更 'disabled' は、次に起こったときにショートカットを無効にします。" #. scroll up @@ -9497,5 +10201,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 "この地物の詳細情報" @@ -9581,5 +10285,5 @@ msgstr "{1}にポイント{0}をダウンロード中..." -#: ../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 @@ -9587,5 +10291,5 @@ msgstr "サーバから返されたデータ ''{0}'' が解析できません" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9617,5 +10321,7 @@ "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " "tracks." -msgstr "備考：GPLは、OSMライセンスと互換性がありません。GPLでライセンスされているトラックをアップロードしないでください。" +msgstr "" +"備考：GPLは、OSMライセンスと互換性がありません。GPLでライセンスされているト" +"ラックをアップロードしないでください。" #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:42 @@ -9705,14 +10411,15 @@ msgstr "不明なモード {0}。" -#: ../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 "id {0} のプリミティブはローカルデータセットにはありません。プリミティブタイプ不明" - -#: ../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 "" +"id {0} のプリミティブはローカルデータセットにはありません。プリミティブタイプ" +"不明" + +#: ../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 @@ -9740,24 +10447,32 @@ msgstr "ID {0} に対してサーバが404コードを返しました。スキップします。" -#: ../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 "''{0}'' からノードのパッケージを取得中" -#: ../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 "''{0}'' からウェイのパッケージを取得中" -#: ../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 "''{0}'' からリレーションのパッケージを取得中" -#: ../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 "サーバがレスポンスコード404を返しました、各プリミティブの個別リクエストで最試行中" +msgstr "" +"サーバがレスポンスコード404を返しました、各プリミティブの個別リクエストで最試" +"行中" + +#: ../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}'' をダウンロード中" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9799,98 +10514,103 @@ msgstr "設定 ''{0}'' がみつかりません。OsmApi を初期化できません" -#: ../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 "このバージョンのJOSMは、設定されたサーバーと互換性がありません。" -#: ../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 "" -"これは、プロトコールバージョン 0.5 と 0.6 をサポートしていますが、サーバーは、 {0} から {1}をサポートするといっています。" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#, fuzzy, java-format +msgid "" +"It supports protocol version 0.6, while the server says it supports {0} to " +"{1}." +msgstr "" +"これは、プロトコールバージョン 0.5 と 0.6 をサポートしていますが、サーバー" +"は、 {0} から {1}をサポートするといっています。" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "プロトコルバージョン {1}を使った確立された{0}で通信する。" -#: ../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 "予想外の形式のID がサーバから返されました。入力値: ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 #, java-format msgid "" "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''." -msgstr "変更されたプリミティブ ''{0}'' の新しいバージョンに予期せぬ形式。入力値: ''{1}''" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 +msgstr "" +"変更されたプリミティブ ''{0}'' の新しいバージョンに予期せぬ形式。入力値: " +"''{1}''" + +#: ../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 "変更セット {0} を開きました" -#: ../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 "変更セット {0} を更新中..." -#: ../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 "diffアップロードのための変更セットを用意できませんでした。" -#: ../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 "10秒待機中 ... " -#: ../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 "{2} 秒で {1} 分の {0} 回の再試行を開始 ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 msgid "OK - trying again." msgstr "OK - やり直しています。" -#: ../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 "{1} 分の {0} 回の再試行を開始。" -#: ../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 "現在の変更セットのID > 0 でなければなりません。現在のID: {0}." -#: ../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}." -msgstr "開かれた変更セットであるべきです。ID {0} の閉じられた変更セットを受け取りました。" +msgstr "" +"開かれた変更セットであるべきです。ID {0} の閉じられた変更セットを受け取りまし" +"た。" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -9922,5 +10642,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}''." @@ -9947,5 +10667,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}." @@ -9953,5 +10673,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}" @@ -9961,8 +10681,9 @@ #, java-format msgid "Undefined element ''{0}'' found in input stream. Aborting." -msgstr "入力ストリームに未定義の要素 ''{0}'' が見つかりました。異常終了します。" +msgstr "" +"入力ストリームに未定義の要素 ''{0}'' が見つかりました。異常終了します。" #: ../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}''." @@ -10020,10 +10741,10 @@ #: ../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." -msgstr "" -"警告: " -"パスワードは設定ファイルに平文で保管されています。
パスワードはサーバに平文で、URLエンコードされて送信されます。
重要なパスワードは" +"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 "" +"警告: パスワードは設定ファイルに平文で保管されています。
パスワード" +"はサーバに平文で、URLエンコードされて送信されます。
重要なパスワードは" "使用しないでください。" @@ -10051,7 +10772,9 @@ #, java-format msgid "" -"An error occurred while restoring backup file.
Error " -"is:
{0}" -msgstr "バックアップファイルのレストア中にエラー発生。
エラー:
{0}" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" +"バックアップファイルのレストア中にエラー発生。
エラー:
{0}" #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 @@ -10101,5 +10824,6 @@ "Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got " "''{1}''." -msgstr "OsmPrimitiveType 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" +msgstr "" +"OsmPrimitiveType 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:238 @@ -10116,68 +10840,69 @@ msgstr "ファイル \"{0}\" はありません" -#: ../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 "" -"要素 ''bounds'' に必要な属性がありません。入力値: " -"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。" - -#: ../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 "" +"要素 ''bounds'' に必要な属性がありません。入力値: minlon=''{0}''," +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Found XML element not as direct child of element ." msgstr " 要素を直接引き継いでない XML 要素の が見つかった。" -#: ../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 "ウェイ {1} の上に必要な属性 ''{0}'' がありません。" -#: ../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 "要素 の属性 ''ref'' に不正な値。入力値: {0}。" -#: ../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 "要素 の直接の子要素でないXML 要素 が見つかりました。" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 +msgstr "" +"要素 の直接の子要素でないXML 要素 が見つかりました。" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "リレーション {0} のメンバーに属性 ''ref'' がありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 -#, java-format -msgid "" -"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" +#: ../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 "リレーション {0} のメンバーの属性 ''ref'' に不正な値。入力値: {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "リレーション {1} のメンバー {0} に属性 ''type'' がありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 #, java-format msgid "" "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." -msgstr "リレーション {1} のメンバー {0} の属性 ''type'' に不正な値。入力値: {2}" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 +msgstr "" +"リレーション {1} のメンバー {0} の属性 ''type'' に不正な値。入力値: {2}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 msgid "Incomplete specification with ref=0" msgstr "ref=0の不完全な指定です。" -#: ../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 "入力ストリーム中に未定義の要素 ''{0}'' があります。スキップします。" -#: ../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 "" @@ -10187,70 +10912,78 @@ #. 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 "" "WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, " "API version is ''{3}''. Got {1}." -msgstr "要素 {0} の ''version'' 属性の値を {2} に正常化します、API バージョンは ''{3}''。入力値: {1}。" +msgstr "" +"要素 {0} の ''version'' 属性の値を {2} に正常化します、API バージョンは " +"''{3}''。入力値: {1}。" #. 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 "不明なまたはサポートされない APIバージョン。入力値: {0}" -#: ../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 "ID {0} のOSM プリミティブ「の属性 ''version'' がありません" -#: ../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 "必要な属性 ''{0}'' がありません。" -#: ../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 "属性 ''{0}'' に不正な長い値。入力値: ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 #, java-format msgid "" "Way with external ID ''{0}'' includes missing node with external ID ''{1}''." -msgstr "外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +msgstr "" +"外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" "Marked way {0} with {1} nodes incomplete because at least one node was " "missing in the loaded data and is therefore incomplete too." -msgstr "{1} ノードのウェイ {0} は不完全です。ロードされたデータに少なくとひとつのノードが見つからないため、不完全です。" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +msgstr "" +"{1} ノードのウェイ {0} は不完全です。ロードされたデータに少なくとひとつのノー" +"ドが見つからないため、不完全です。" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" "Unknown relation member type ''{0}'' in relation with external id ''{1}''." -msgstr "外部ID ''{1}'' のリレーションに不明なリレーションメンバータイプ ''{0}''" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +msgstr "" +"外部ID ''{1}'' のリレーションに不明なリレーションメンバータイプ ''{0}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" "Relation with external id ''{0}'' refers to a missing primitive with " "external id ''{1}''." -msgstr "外部ID ''{0}'' のリレーションは外部ID ''{1}'' の存在しないプリミティブを参照しています。" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:554 +msgstr "" +"外部ID ''{0}'' のリレーションは外部ID ''{1}'' の存在しないプリミティブを参照" +"しています。" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 msgid "Prepare OSM data..." msgstr "OSMデータを準備します…" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 msgid "Parsing OSM data..." msgstr "OSMデータ解析中..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 msgid "Preparing data set..." msgstr "データセット準備中..." @@ -10303,4 +11036,10 @@ msgid "Contacting Server..." msgstr "サーバに接続中..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 +#, fuzzy, java-format +msgid "Expected value > 0 for parameter ''{0}'', got {1}" +msgstr "パラメータ \"index\" に予期せぬ値。入力値: {0}" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10338,45 +11077,46 @@ msgstr "XML タグ ''{1}'' の属性 ''{0}'' に不正な値。入力値: {2}。" -#: ../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 "{0}% ({1}/{2}), 残り {3} 。ノード ''{4}'' をアップロード中(ID: {5})" -#: ../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 "{0}% ({1}/{2}), 残り {3} 。ウェイ ''{4}'' をアップロード中(ID: {5})" -#: ../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 "{0}% ({1}/{2}), 残り {3} 。リレーション ''{4}'' をアップロード中(ID: {5})" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 +msgstr "" +"{0}% ({1}/{2}), 残り {3} 。リレーション ''{4}'' をアップロード中(ID: {5})" + +#: ../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 +#, fuzzy, java-format +msgid "Value >0 expected for parameter ''{0}'', got {1}" +msgstr "パラメータ \"index\" に予期せぬ値。入力値: {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 +#, fuzzy +msgid "Starting to upload in chunks..." +msgstr "ひとつのリクエストでアップロード開始..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#, fuzzy, java-format +msgid "({0}/{1}) Uploading {2} objects..." +msgstr "{0} オブジェクトをアップロード中 ..." + +#: ../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 "警告: アップロードするデータにAPIバージョンが定義されていません。バージョン0.6 にフォールバックします。" - -#: ../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 "" -"警告: 設定 ''{0}'' またはデータセットのAPI バージョン ''{1}'' では差分アップロードの使用が必須ですが、API " -"は取扱えません。差分アップロードを無視します。" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10416,17 +11156,27 @@ msgstr "プラグイン {0} をダウンロードしています..." -#: ../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 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Error deleting plugin file: {0}" + +#: ../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}." @@ -10438,22 +11188,21 @@ msgstr "プラグイン {0} でエラーが発生しました。" -#: ../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 "{0} プラグインのロードが要求されました。このプラグインは今は必須ではありません。" - -#: ../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 "" -"プラグイン {0} " -"が読み込まれました。
このプラグインは開発を終了していて、問題を起こす可能性があります。
無効にしてください。
使用をやめますか？" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +"developed and very likely will produce errors.
It should be disabled." +"
Delete from preferences?" +msgstr "" +"プラグイン {0} が読み込まれました。
このプラグインは開発を終了してい" +"て、問題を起こす可能性があります。
無効にしてください。
使用をやめます" +"か？" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 msgid "" "You updated your JOSM software.\n" @@ -10462,60 +11211,65 @@ 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 "プラグインが最後に更新されてから{0}日以上経過しました。" -#: ../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 "プラグイン {0} を使うには JOSMをバージョン {1} にアップデートする必要があります。" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166 +msgstr "" +"プラグイン {0} を使うには JOSMをバージョン {1} にアップデートする必要がありま" +"す。" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." -msgstr "プラグイン {0} は、プラグイン {1} の動作に必要ですが、見つかりませんでした。" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181 +msgstr "" +"プラグイン {0} は、プラグイン {1} の動作に必要ですが、見つかりませんでした。" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182 #, java-format msgid "Plugin not found: {0}." msgstr "プラグインが見つかりません： {0}" -#: ../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 "プラグイン {0} を読み込めません。設定から削除しますか？" -#: ../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 " "overwrite the existing ones." -msgstr "アップロードしたプラグインを有効にできませんでした。JOSMが既存のプラグインに上書きできる権限があるかどうか、確認してください。" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314 +msgstr "" +"アップロードしたプラグインを有効にできませんでした。JOSMが既存のプラグインに" +"上書きできる権限があるかどうか、確認してください。" + +#: ../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 "" @@ -10523,33 +11277,37 @@ msgstr "予期せぬ例外がプラグイン\"{0}\"で発生しました。" -#: ../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 "このプラグインから得られる情報では、作者は {0} です。" -#: ../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 +msgstr "" +"バグレポートをする前に、最新バージョンのプラグインにアップデートしてくださ" +"い。" + +#: ../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 " "unload the plugin." -msgstr "プラグインは設定から削除されています。プラグインをアンロードするためにJOSMを再起動してください。" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341 +msgstr "" +"プラグインは設定から削除されています。プラグインをアンロードするためにJOSMを" +"再起動してください。" + +#: ../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" @@ -10644,5 +11402,6 @@ "予想外の例外が発生しました。\n" "\n" -"これは通常プログラミングの誤りです。最新のJOSMのバージョンを使っている場合には、\n" +"これは通常プログラミングの誤りです。最新のJOSMのバージョンを使っている場合に" +"は、\n" "大目にみて、ぜひバグレポートをぜひお願いします。" @@ -10667,6 +11426,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 "" @@ -10691,5 +11450,6 @@ "the server URL in your preferences and your internet connection." msgstr "" -"OSM サーバ {0} との通信の初期化に失敗しました。
設定のサーバURLとインターネット接続をチェックしてください。" +"OSM サーバ {0} との通信の初期化に失敗しました。
設定のサーバURLとイ" +"ンターネット接続をチェックしてください。" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 @@ -10700,6 +11460,7 @@ "reference to relation {0}, and upload again." msgstr "" -"リレーション {0}の削除に失敗。リレーション {1} " -"がまだ参照しています。
リレーション {1} をロードし、リレーション {0} への参照を削除し、再度アップロードしてください。" +"リレーション {0}の削除に失敗。リレー" +"ション {1} がまだ参照しています。
リレーション {1} をロードし、リレーショ" +"ン {0} への参照を削除し、再度アップロードしてください。" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 @@ -10707,9 +11468,9 @@ msgid "" "Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message " -"is:
{0}" -msgstr "" -"サーバへのアップロードは失敗しました。 " -"現在の
データセットは前提条件に違反しています。
エラーメッセージ:
{0}" +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" +"サーバへのアップロードは失敗しました。 現在の
デー" +"タセットは前提条件に違反しています。
エラーメッセージ:
{0}" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 @@ -10718,5 +11479,7 @@ "Closing of changeset {0} failed
because it has " "already been closed." -msgstr "変更セット{0}を閉じることができません。
既に閉じられています。" +msgstr "" +"変更セット{0}を閉じることができません。
既に閉じら" +"れています。" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 @@ -10726,5 +11489,6 @@ "already been closed on {1}." msgstr "" -"変更セット{0}を閉じることができません。
{1} で既に閉じられています。" +"変更セット{0}を閉じることができません。
{1} で既に" +"閉じられています。" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 @@ -10753,6 +11517,7 @@ "applet and because you didn''t load your applet from ''{1}''." msgstr "" -"リモートサーバ
''{0}''
への接続にセキュリティ上の理由で接続を開けませんでした。おそらくアプレットを実行しているがアプレッ" -"トを ''{1}' からロードしていないためだと思われます。" +"リモートサーバ
''{0}''
への接続にセキュリティ上の理由で接続を開け" +"ませんでした。おそらくアプレットを実行しているがアプレットを ''{1}' からロー" +"ドしていないためだと思われます。" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 @@ -10761,5 +11526,7 @@ "Failed to open a connection to the remote server
''{0}''.
Please " "check your internet connection." -msgstr "リモートサーバ ''{0}' への接続が開けません。
インターネット接続をチェックしてください。" +msgstr "" +"リモートサーバ ''{0}' への接続が開けません。
インターネット接続を" +"チェックしてください。" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 @@ -10769,17 +11536,16 @@ "problem with transferring data.
Details(untranslated): {1}" msgstr "" -"データのアップロード先またはダウンロード元Failed to upload data to or download data " -"from
''{0}''
で、データ転送中に問題が発生したために処理が失敗しました。
詳細(原文): {1}" +"データのアップロード先またはダウンロード元Failed to upload data to or " +"download data from
''{0}''
で、データ転送中に問題が発生したために処理が" +"失敗しました。
詳細(原文): {1}" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" -"The OSM server
''{0}''
reported an internal server " -"error.
This is most likely a temporary problem. Please try again " -"later." -msgstr "" -"OSM " -"サーバ
''{0}''
からサーバの内部エラーの連絡がありました。
おそらく一時的な問題です。後ほどやり直してみてください。" +"The OSM server
''{0}''
reported an internal server error." +"
This is most likely a temporary problem. Please try again later." +msgstr "" +"OSM サーバ
''{0}''
からサーバの内部エラーの連絡がありました。
" +"おそらく一時的な問題です。後ほどやり直してみてください。" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 @@ -10790,10 +11556,11 @@ #: ../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." -msgstr "" -"ダウンロードしようとしたエリアが大きすぎるか、リクエストが大きすぎます。
もっと小さいエリアでリクエストするか、OSM " -"コミュニティから提供されたエクスポートファイルを使用してください。" +"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 "" +"ダウンロードしようとしたエリアが大きすぎるか、リクエストが大きすぎます。
" +"もっと小さいエリアでリクエストするか、OSM コミュニティから提供されたエクス" +"ポートファイルを使用してください。" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 @@ -10818,6 +11585,7 @@ "preferences and your internet connection." msgstr "" -"リモートサーバ
''{0}''.
への接続を開けませんでした。ホスト名 ''{1}'' を解決できません。
設定のAPI " -"URL とインターネット接続をチェックしてください。" +"リモートサーバ
''{0}''.
への接続を開けませんでした。ホスト名 " +"''{1}'' を解決できません。
設定のAPI URL とインターネット接続をチェックし" +"てください。" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 @@ -10826,11 +11594,11 @@ "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}" -msgstr "" -"サーバからオブジェクト削除の報告がありました。
このオブジェクトを更新または削除しようとしたのであればアップロードは失敗" -"です。
" -"このオブジェクトをダウンロードしようとしたのであればダウンロードは失敗です。

エラーメッセージ:
{" -"0}" +"Downloading failed if you tried to download this object." +"

The error message is:
{0}" +msgstr "" +"サーバからオブジェクト削除の報告がありました。
このオブジェクトを更" +"新または削除しようとしたのであればアップロードは失敗です。" +"
このオブジェクトをダウンロードしようとしたのであればダウンロード" +"は失敗です。

エラーメッセージ:
{0}" #: ../core/src/org/openstreetmap/josm/tools/I18n.java:98 @@ -10858,5 +11626,7 @@ "Warning: failed to acccess directory ''{0}'' for security reasons. Exception " "was: {1}" -msgstr "警告: セキュリティ上の理由によりディレクトリ ''{0}'' へのアクセスに失敗。例外: {1}" +msgstr "" +"警告: セキュリティ上の理由によりディレクトリ ''{0}'' へのアクセスに失敗。例" +"外: {1}" #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202 @@ -10865,5 +11635,7 @@ "Fatal: failed to locate image ''{0}''. This is a serious configuration " "problem. JOSM will stop working." -msgstr "Fatal: 画像 ''{0}'' の配置に失敗しました。これは深刻な構成の問題です。JOSM は動作停止します。" +msgstr "" +"Fatal: 画像 ''{0}'' の配置に失敗しました。これは深刻な構成の問題です。JOSM は" +"動作停止します。" #: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24 @@ -10881,5 +11653,6 @@ "\n" msgstr "" -"キーボードショートカット\"{0}\"がすでにアクション\"{3}\"({4})のためにとられているために\n" +"キーボードショートカット\"{0}\"がすでにアクション\"{3}\"({4})のためにとられて" +"いるために\n" "アクション\"{1}\"({2})への割り当てに失敗しました。\n" "\n" @@ -10919,5 +11692,6 @@ "Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " "was: {1}" -msgstr "警告: セキュリティ上の理由で ''{0}'' からMOTD の読み込みに失敗。例外: {1}" +msgstr "" +"警告: セキュリティ上の理由で ''{0}'' からMOTD の読み込みに失敗。例外: {1}" #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 @@ -10926,5 +11700,7 @@ "Preference with key ''{0}'' does not include ''{1}''. Can''t restore window " "geometry from preferences." -msgstr "キー ''{0}'' の設定は ''{1}'' を含んでいません。設定から window geometry を復元できません。" +msgstr "" +"キー ''{0}'' の設定は ''{1}'' を含んでいません。設定から window geometry を復" +"元できません。" #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 @@ -10934,6 +11710,6 @@ "{2}. Can''t restore window geometry from preferences." msgstr "" -"キー ''{0}'' の設定は ''{1}'' にint 値を与えていません。入力値: {2}。設定から window geometry " -"を復元できません。" +"キー ''{0}'' の設定は ''{1}'' にint 値を与えていません。入力値: {2}。設定か" +"ら window geometry を復元できません。" #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 @@ -10943,6 +11719,6 @@ "{2}. Can''t restore window geometry from preferences." msgstr "" -"キー ''{0}'' の設定中のフィールド ''{1}'' の解析に失敗しました。例外コード: {2}。設定から window geometry " -"を復元できません。" +"キー ''{0}'' の設定中のフィールド ''{1}'' の解析に失敗しました。例外コード: " +"{2}。設定から window geometry を復元できません。" #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 @@ -10951,5 +11727,7 @@ "Preference with key ''{0}'' does not exist. Can''t restore window geometry " "from preferences." -msgstr "キー ''{0}'' の設定が存在しません。設定から window geometry を復元できません。" +msgstr "" +"キー ''{0}'' の設定が存在しません。設定から window geometry を復元できませ" +"ん。" #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 @@ -10961,5 +11739,7 @@ "Forms a grid of ways in base to two existing that have various nodes and one " "in common" -msgstr "既存の複数ノードもつ2つのウェイとその交点に基づき、ノードを碁盤の目として、格子状のウェイ構造をつくります。" +msgstr "" +"既存の複数ノードもつ2つのウェイとその交点に基づき、ノードを碁盤の目として、格" +"子状のウェイ構造をつくります。" #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 @@ -10991,5 +11771,7 @@ "Identifiable (shown in trace list and as identifiable, ordered points with " "timestamps)" -msgstr "識別公開 (トレースリストの指定ポイントとタイムスタンプを自身によるものとして公開する)" +msgstr "" +"識別公開 (トレースリストの指定ポイントとタイムスタンプを自身によるものとして" +"公開する)" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 @@ -11091,5 +11873,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" @@ -11104,12 +11886,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 @@ -11117,453 +11897,145 @@ 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 "リレーション: {0}" -#: ../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 "{0} 付加番地に関連付ける" -#: ../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 +#, fuzzy +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 "国コードは2文字でなければなりません" -#: ../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 "" -"\n" -"高度: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/h" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "EXIFからGPS位置を取得" - -#: ../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 "標準的なディレクトリへのパスを入手できません {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "ディレクトリ {0} を走査" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "ディレクトリ {0}に中身のないファイルが見つかりました\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "ディレクトリからファイルを入手中のエラー {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "GPXに関連づける" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} は gps タグがつけられていることがわかりました。" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "AgPifoJで画像を開く..." - -#: ../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 "GPXファイル(*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "ファイル {0} は、\"{1}\"という名前でですが、読み込まれました。" - -#: ../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 "" -" 使用しているGPSレシーバーの、時刻を表示しているところの写真をとります。
その写真をここに表示してください。
" -"そして写真に表示されている時刻を読み取って、タイムゾーンを選択します。
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "写真の時刻(exifから取得):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "(写真から読み取った)GPSの時刻: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [dd/mm/yyyy hh:mm:ss]" - -#: ../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 "GPSレシーバーの写真から時刻を同期" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"日付時刻の解釈時にエラーになりました。\n" -"入力する形式を確認してください。" - -#: ../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 "GPXトラック: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "ほかのGPXトレースを開く" - -#: ../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 "私のGPSレシーバーは写真を撮ることができます。
これは使えますか。" - -#: ../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 "exif位置のついていない画像" - -#: ../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 "GPXトラックに画像を関連づけます。" - -#: ../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 "GPXトラックを選択しなければなりません" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "GPXトラックの選択がありません" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"タイムゾーンの解釈時にエラーになりました。\n" -"期待する形式: {0}" - -#: ../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 "" -"オフセット区切り作業中にエラーです。\n" -"期待されるフォーマット: {0}" - -#: ../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 "GPX トラック {2} に、{1}中に{0}枚発見しました。" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPXトラックが読み込まれました" - -#: ../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 "選択されたGPXトラックはタイムスタンプを含んでいません。他のGPXトラックを選択してください。" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPXトラックは、時間情報を持っていません。" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "タイムゾーン: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "分: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "秒: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "{0}／{1} 枚の写真がGPXトラックにマッチしました。" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(時差 {0} 日)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "トラックと写真の間には、時差があります。: {0}分 {1}秒" - -#: ../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 "GPX トラックと写真の照合中にエラーが発生。スライダーを調整して写真と手動で照合できます。" - -#: ../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 "{0} 読み込み中です" - -#: ../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 "ファイル{0}にエラー" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11681,5 +12153,7 @@ msgid "" "Warning: failed to put option pane dialog always on top. Exception was: {0}" -msgstr "警告: オプションペインダイアログを常時トップに表示するのに失敗しました。例外コード: {0}" +msgstr "" +"警告: オプションペインダイアログを常時トップに表示するのに失敗しました。例外" +"コード: {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 @@ -11714,18 +12188,16 @@ #: ../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." -msgstr "" -"フランス cadastre wms (www.cadastre.gouv.fr) " -"の特別なハンドラ

このプラグインで作成されたデータをアップロードする前に、こちらの利用許諾条件を読んでください (フランス語): " -"
" -"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html" +"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 "" +"フランス cadastre wms (www.cadastre.gouv.fr) の特別なハンドラ

このプラ" +"グインで作成されたデータをアップロードする前に、こちらの利用許諾条件を読んで" +"ください (フランス語):
http://www.cadastre.gouv.fr/scpc/html/" +"CU_01_ConditionsGenerales_fr.html" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 @@ -11752,5 +12224,6 @@ "Invert the original black and white colors (and all intermediate greys). " "Useful for texts on dark backgrounds." -msgstr "元の白と黒(すべてのグレーも)を反転します。背景が暗いテキストで役に立ちます。" +msgstr "" +"元の白と黒(すべてのグレーも)を反転します。背景が暗いテキストで役に立ちます。" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101 @@ -11834,5 +12307,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." -msgstr "自動ソース作成を有効にし、土地台帳-レジストリビンテージをチェックしてください" +msgstr "" +"自動ソース作成を有効にし、土地台帳-レジストリビンテージをチェックしてください" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64 @@ -11994,5 +12468,7 @@ msgid "" "Selected file {0} is not a cache file from this plugin (invalid extension)" -msgstr "選択されたファイル {0} はこのプラグインからのキャッシュファイルではありません(不正なエクステンション)" +msgstr "" +"選択されたファイル {0} はこのプラグインからのキャッシュファイルではありません" +"(不正なエクステンション)" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 @@ -12023,6 +12499,6 @@ "known by www.cadastre.gouv.fr ." msgstr "" -"町、村または市区の名前を入力してください。
文法や句読点はwww.cadastre.gouv.fr " -"に従ってください。(フランス語の場合)" +"町、村または市区の名前を入力してください。
文法や句読点はwww." +"cadastre.gouv.fr に従ってください。(フランス語の場合)" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:61 @@ -12045,11 +12521,4 @@ msgid "Export as PNG format (only raster images)" msgstr "PNG 形式でエクスポート(ラスター画像のみ)" - -#: ../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] "ウェイの簡素化 ( {0} このノードを削除)" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 @@ -12116,5 +12585,7 @@ "Unsupported cache file version; found {0}, expected {1}\n" "Create a new one." -msgstr "サポートされないキャッシュファイルのバージョン; {0} が見つかりましたが、 {1} であるべきです" +msgstr "" +"サポートされないキャッシュファイルのバージョン; {0} が見つかりましたが、 {1} " +"であるべきです" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 @@ -12125,5 +12596,6 @@ #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません" +msgstr "" +"キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424 @@ -12164,14 +12636,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:41 +#: ../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:39 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 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 " @@ -12382,7 +12854,7 @@ "plugin/" msgstr "" -"rxtxSerialライブラリ からロードすることができません。もし、それをインストールするためのサポートが必要であれば、Globalsat " -"ホームページ（ http://www.raphael-mack.de/josm-globalsat-gpx-import-plugin/ " -"）を試してください。" +"rxtxSerialライブラリ からロードすることができません。もし、それをインストール" +"するためのサポートが必要であれば、Globalsat ホームページ（ http://www." +"raphael-mack.de/josm-globalsat-gpx-import-plugin/ ）を試してください。" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 @@ -12393,5 +12865,6 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." -msgstr "グローバルサット・データロガー DG1000からGPXレイヤーにデータをインポート" +msgstr "" +"グローバルサット・データロガー DG1000からGPXレイヤーにデータをインポート" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 @@ -12484,4 +12957,8 @@ msgstr "画像をImageWayPointで開く" +#: ../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" @@ -12525,18 +13002,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 "Douglas-Peuckerの近似を実行します..." -#: ../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" @@ -12585,7 +13062,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12595,5 +13072,5 @@ #. 50000 #. -#. +#. #. #. @@ -12603,5 +13080,5 @@ #. 50000 #. -#. +#. #. #. @@ -12610,5 +13087,5 @@ #. 50000 #. -#. +#. #. #. @@ -12618,5 +13095,5 @@ #. 50000 #. -#. +#. #. #. @@ -12694,6 +13171,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 "各生成されたウェイで許されるセグメントの最大数。既定値は250" @@ -12702,5 +13178,7 @@ "Maximum number of nodes to generate before bailing out (before simplifying " "lines). Default 50000." -msgstr "データを間引く前（つまり、ラインを単純化する前）に、生成させるノードの最大数。デフォルト値は50000。" +msgstr "" +"データを間引く前（つまり、ラインを単純化する前）に、生成させるノードの最大" +"数。デフォルト値は50000。" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71 @@ -12708,13 +13186,15 @@ "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be " "in the range 0-255. Default 90." -msgstr "水域として認めるグレーの最大値（Landsat IR-1 データに基づく）。0-255の範囲にである．デフォルトは90。" +msgstr "" +"水域として認めるグレーの最大値（Landsat IR-1 データに基づく）。0-255の範囲に" +"である．デフォルトは90。" #: ../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." -msgstr "" -"Douglas-Peucker ライン簡素化の精度、度数で計測されます。
低い値でノードや正確なラインが増えます。 既定値 0.0003。" +"Accuracy of Douglas-Peucker line simplification, measured in degrees." +"
Lower values give more nodes, and more accurate lines. Default 0.0003." +msgstr "" +"Douglas-Peucker ライン簡素化の精度、度数で計測されます。
低い値でノードや" +"正確なラインが増えます。 既定値 0.0003。" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 @@ -12775,20 +13255,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 "接続失敗" @@ -12982,6 +13461,7 @@ "new server? (Strongly recommended)" msgstr "" -"openstreetbugs プラグインは appspot.com の古いサーバを使用しています。
schokokeks.org " -"の新しいサーバが利用できます。
新しいサーバに切り換えますか？ (強く推奨)" +"openstreetbugs プラグインは appspot.com の古いサーバを使用しています。" +"
schokokeks.org の新しいサーバが利用できます。
新しいサーバに切り換えま" +"すか？ (強く推奨)" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 @@ -12994,6 +13474,6 @@ "upload this data. Maybe you have selected the wrong layer?" msgstr "" -"選択されたデータはOpenStreetBugs " -"のデータを含んでいます。
このデータはアップロードできません。違うレイヤーを選択したようですね？" +"選択されたデータはOpenStreetBugs のデータを含んでいます。
このデータ" +"はアップロードできません。違うレイヤーを選択したようですね？" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -13009,7 +13489,8 @@ #: ../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" -msgstr "ヘッダが複数の値を含んでいるため、一つのストリングに描画することができません。" +msgid "Header contains several values and cannot be mapped to a single string" +msgstr "" +"ヘッダが複数の値を含んでいるため、一つのストリングに描画することができませ" +"ん。" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96 @@ -13026,5 +13507,7 @@ "The visible area is either too small or too big to download data from " "OpenStreetBugs" -msgstr "表示エリアはOpenStreetBugs からデータをダウンロードするには小さすぎるか大きすぎます" +msgstr "" +"表示エリアはOpenStreetBugs からデータをダウンロードするには小さすぎるか大きす" +"ぎます" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50 @@ -13049,5 +13532,7 @@ "Really mark this issue as ''done''?

You may add an optional " "comment:" -msgstr "この件を本当に''完了''としてマークしますか？

コメントを追加できます:" +msgstr "" +"この件を本当に''完了''としてマークしますか？

コメントを追加でき" +"ます:" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64 @@ -13089,19 +13574,18 @@ 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 "Osmarender" -#: ../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 " "the preferences." -msgstr "Firefoxが見つかりません。設定のマップ設定ページでfirefoxの実行ファイルの位置を設定してください。" - -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "osmarenderオプション" - -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:127 +msgstr "" +"Firefoxが見つかりません。設定のマップ設定ページでfirefoxの実行ファイルの位置" +"を設定してください。" + +#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133 msgid "Firefox executable" msgstr "Firefoxの実行ファイル" @@ -13149,6 +13633,6 @@ "talking to the plugin." msgstr "" -"リモコンプラグインは、常にlocalhostの8111番ポートで待ち受けます。プラグインと会話をするほかのアプリケーションが参照するので、ポート番号は変更" -"できません。" +"リモコンプラグインは、常にlocalhostの8111番ポートで待ち受けます。プラグインと" +"会話をするほかのアプリケーションが参照するので、ポート番号は変更できません。" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41 @@ -13158,5 +13642,7 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124 msgid "Remote Control has been asked to load data from the API." -msgstr "APIを通じて、リモートコントロールプラグインによって、データをロードするよう要求されました。" +msgstr "" +"APIを通じて、リモートコントロールプラグインによって、データをロードするよう要" +"求されました。" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 @@ -13183,5 +13669,7 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" -msgstr "リモートコントロールは以下のURLからデータをインポートするように確認されました。:" +msgstr "" +"リモートコントロールは以下のURLからデータをインポートするように確認されまし" +"た。:" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -13469,5 +13957,6 @@ msgid "" "Open the tagging preset test tool for previewing tagging preset dialogs." -msgstr "タグ付けプリセットテストを開いてタグ付けプリセットダイアログをプレビュー。" +msgstr "" +"タグ付けプリセットテストを開いてタグ付けプリセットダイアログをプレビュー。" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34 @@ -13475,17 +13964,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 "テラスを反転" @@ -13529,162 +14018,4 @@ msgid "Optional" 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 "現在最大2つまでのエリアのみ結合できます。" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 -#, java-format -msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "\"{0}\" は閉じられていないので連結できません。" - -#: ../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 "" -"選択されたウェイにはダウンロードされたデータ領域の外側にノードがあります。\n" -"これはノードを誤って削除する可能性があります。\n" -"本当に続けますか？" - -#: ../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 "www.openstreetmap.orgから、URLを貼り付けることもできます。" - -#: ../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] "選択には {0} ウェイが含まれます。本当に簡略化しますか？" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "よろしいですか？" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13749,5 +14080,7 @@ "An OSM data validator that checks for common errors made by users and editor " "programs." -msgstr "OSM データ妥当性検証はユーザや編集プログラムによる一般的なエラーをチェックします。" +msgstr "" +"OSM データ妥当性検証はユーザや編集プログラムによる一般的なエラーをチェックし" +"ます。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99 @@ -13782,5 +14115,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}" @@ -13833,34 +14166,34 @@ msgstr "次回から選択したエラーを無視する。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../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:197 +#: ../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:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "何もしない" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "全体のグループか個々の要素を無視しますか?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 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 "({0}/{1}) 修正中: ''{2}''" -#: ../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 "地図を更新中 ..." @@ -13899,5 +14232,7 @@ "This test checks if two roads, railways, waterways or buildings crosses in " "the same layer, but are not connected by a node." -msgstr "このテストではふたつの道路、鉄道、水路あるいは建物が同じレイヤーでクロスはしているがノードで接続されていないことをチェックします。" +msgstr "" +"このテストではふたつの道路、鉄道、水路あるいは建物が同じレイヤーでクロスはし" +"ているがノードで接続されていないことをチェックします。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125 @@ -13909,18 +14244,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 "確認" @@ -13989,5 +14324,7 @@ "This test checks that a connection between two nodes is not used by more " "than one way." -msgstr "このテストはふたつのノード間の接続がひとつ以上のウェイで使用されていないかチェックします。" +msgstr "" +"このテストはふたつのノード間の接続がひとつ以上のウェイで使用されていないか" +"チェックします。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107 @@ -14151,11 +14488,9 @@ #: ../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." -msgstr "" -"スペルチェックのソース(URL " -"またはファイル名)(http://wiki.openstreetmap.org/index.php/User:JLS/speller 参照) " -"またはタグをチェックするデータファイル。" +"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." +"org/index.php/User:JLS/speller) or tag checking data files." +msgstr "" +"スペルチェックのソース(URL またはファイル名)(http://wiki.openstreetmap.org/" +"index.php/User:JLS/speller 参照) またはタグをチェックするデータファイル。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 @@ -14297,5 +14632,5 @@ #. 50000 #. -#. +#. #. #. @@ -14303,5 +14638,5 @@ #. #. -#. +#. #. #. @@ -14311,5 +14646,5 @@ #. 50000 #. -#. +#. #. #. @@ -14318,5 +14653,5 @@ #. 50000 #. -#. +#. #. #. @@ -14325,5 +14660,5 @@ #. 50000 #. -#. +#. #. #. @@ -14332,5 +14667,5 @@ #. 50000 #. -#. +#. #. #. @@ -14339,5 +14674,5 @@ #. 50000 #. -#. +#. #. #. @@ -14346,9 +14681,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14393,5 +14728,5 @@ #. 50000 #. -#. +#. #. #. @@ -14411,5 +14746,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61 msgid "This test checks if a way has an endpoint very near to another way." -msgstr "このテストはウェイが別のウェイのすぐ近くにエンドポイントを持っているかチェックしています。" +msgstr "" +"このテストはウェイが別のウェイのすぐ近くにエンドポイントを持っているかチェッ" +"クしています。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126 @@ -14436,5 +14773,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38 msgid "This test checks for untagged nodes that are not part of any way." -msgstr "このテストはどのウェイにも属さないタグ無しのノードをチェックしています。" +msgstr "" +"このテストはどのウェイにも属さないタグ無しのノードをチェックしています。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59 @@ -14444,5 +14782,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60 msgid "This test checks for untagged, empty and one node ways." -msgstr "このテストはタグ無し、空、そして単一ノードのウェイをチェックしています。" +msgstr "" +"このテストはタグ無し、空、そして単一ノードのウェイをチェックしています。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91 @@ -14524,14 +14863,14 @@ msgstr "Walking Papers" -#: ../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 " @@ -14540,14 +14879,15 @@ 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 +msgstr "" +"ダウンロードを開始するユニークなノードを見つけられませんでした。" + +#: ../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 "" @@ -14556,5 +14896,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 "" @@ -14566,13 +14906,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." @@ -14626,5 +14966,7 @@ "Couldn't match the entered link or id to the selected service. Please try " "again." -msgstr "入力されたリンクまたはID を選択されたサービスにマッチさせることができませんでした。もう一度試してください。" +msgstr "" +"入力されたリンクまたはID を選択されたサービスにマッチさせることができませんで" +"した。もう一度試してください。" #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:201 @@ -14661,5 +15003,7 @@ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' " "or a trailing '?'." -msgstr "警告: WMS サービス用のベースURL ''{0}'' には末尾の '&' または '?' がありません。" +msgstr "" +"警告: WMS サービス用のベースURL ''{0}'' には末尾の '&' または '?' がありませ" +"ん。" #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 @@ -14715,6 +15059,6 @@ msgstr "" "このWMS レイヤー用のベースURL
''{0}''
の終わりに ''&'' や ''?'' " -"を付けてはなりません。
そうすると不正なWMSリクエストとなる場合があります。設定を
チェックしてください。
強制的にWMS " -"タイルを取得しますか？" +"を付けてはなりません。
そうすると不正なWMSリクエストとなる場合があります。" +"設定を
チェックしてください。
強制的にWMS タイルを取得しますか？" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 @@ -14729,52 +15073,53 @@ msgid "" "The requested area is too big. Please zoom in a little, or change resolution" -msgstr "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +msgstr "" +"要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。" + +#: ../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 "WMSレイヤーをファイルに保存" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "WMS レイヤーを保存" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "WMSレイヤーをファイルから読み込む" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "WMS レイヤーをロード" -#: ../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 "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}" -#: ../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 "WMSブックマークをセット" @@ -14850,5 +15195,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 "" @@ -14856,5 +15201,6 @@ "area, or use planet.osm" msgstr "" -"あまりにたくさんのノードを要求しました（制限は50,000です)。 より小さなエリアで要求し直すか、planet.osmを使用してください。" +"あまりにたくさんのノードを要求しました（制限は50,000です)。 より小さなエリア" +"で要求し直すか、planet.osmを使用してください。" #. OSM server message @@ -14868,5 +15214,7 @@ "The maximum bbox size is 0.25, and your request was too large. Either " "request a smaller area, or use planet.osm" -msgstr "bbox の最大は 0.25です。要求された範囲は大きすぎます。より小さい範囲を要求するか、planet.osm を使用して下さい。" +msgstr "" +"bbox の最大は 0.25です。要求された範囲は大きすぎます。より小さい範囲を要求す" +"るか、planet.osm を使用して下さい。" #. OSM server message @@ -14883,25 +15231,21 @@ #: build/specialmessages.java:11 msgid "You must make your edits public to upload new data" -msgstr "新しいデータをアップロードするには編集をパブリックにしなければなりません" +msgstr "" +"新しいデータをアップロードするには編集をパブリックにしなければなりません" #. 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 "標準とは別の JOSM 用ジオタグ plugin。GPS ログと、写真の EXIFに埋め込まれたジオタグを関連づけします。" - -#. Plugin cadastre-fr -#: build/trans_plugins.java:7 msgid "A special handler for the French land registry WMS server." msgstr "フランス土地台帳WMS server 用の特別なハンドラ。" #. Plugin colorscheme -#: build/trans_plugins.java:9 +#: build/trans_plugins.java:7 msgid "" "Allows the user to create different color schemes and to switch between " @@ -14911,14 +15255,16 @@ "true :-)" msgstr "" -"ユーザは異なる色スキームを作成し、切り替えることができます。色を変えて新しいスキームを作成してください。明るい自然光の中で視認性を上げるには一致する色の白" -"い背景に切り替えるのに使われます。JOSMの設定にあるダイアログと 'Map Settings' を参照してください(奇妙ですが本当です :-)" +"ユーザは異なる色スキームを作成し、切り替えることができます。色を変えて新しい" +"スキームを作成してください。明るい自然光の中で視認性を上げるには一致する色の" +"白い背景に切り替えるのに使われます。JOSMの設定にあるダイアログと 'Map " +"Settings' を参照してください(奇妙ですが本当です :-)" #. Plugin Create_grid_of_ways -#: build/trans_plugins.java:11 +#: build/trans_plugins.java:9 msgid "Create a grid of ways." msgstr "ウェイのグリッドを作成。" #. Plugin czechaddress -#: build/trans_plugins.java:13 +#: build/trans_plugins.java:11 msgid "" "Creating and handling address nodes and buildings within Czech Republic." @@ -14926,45 +15272,49 @@ #. Plugin dataimport +#: build/trans_plugins.java:13 +msgid "Allows to import various file formats into JOSM directly." +msgstr "" +"様々なフォーマットのファイルを JOSM に直接インポートできるようにします。" + +#. Plugin DirectUpload #: build/trans_plugins.java:15 -msgid "Allows to import various file formats into JOSM directly." -msgstr "様々なフォーマットのファイルを JOSM に直接インポートできるようにします。" - -#. Plugin DirectUpload -#: build/trans_plugins.java:17 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " "openstreetmap.org." -msgstr "このプラグインは現在アクティブなJOSMレイヤーのGPSトラックをopenstreetmap.orgへ直接アップロードします。" +msgstr "" +"このプラグインは現在アクティブなJOSMレイヤーのGPSトラックをopenstreetmap.org" +"へ直接アップロードします。" #. Plugin Duplicate-Way -#: build/trans_plugins.java:19 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "オフセットのあるウェイを複製" #. Plugin editgpx -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " "very fast." -msgstr "ユーザにタイムスタンプの匿名化と広大なGPX トラックの部分的な高速削除を許可する。" +msgstr "" +"ユーザにタイムスタンプの匿名化と広大なGPX トラックの部分的な高速削除を許可す" +"る。" #. Plugin globalsat +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." +msgstr "GlobalSat DG-100データロガーからJOSMに直接GPSポイントをダウンロード" + +#. Plugin graphview #: build/trans_plugins.java:23 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." -msgstr "GlobalSat DG-100データロガーからJOSMに直接GPSポイントをダウンロード" - -#. Plugin graphview -#: build/trans_plugins.java:25 msgid "Visualizes routing information as a routing graph." msgstr "ルーティング情報をルーティンググラフとして可視化する。" #. Plugin grid -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "地図グリッドを表示する背景レイヤーを提供します。" #. Plugin ImageWayPoint -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -14972,14 +15322,15 @@ "the filename of an image." msgstr "" -"画像をGPX ファイル内のウェイポイントと照合する別のプラグイン。照合はウェイポイントタグの 'name', 'cmt' または 'desc' " -"属性が画像のファイル名と一致したときに行われます。" +"画像をGPX ファイル内のウェイポイントと照合する別のプラグイン。照合はウェイポ" +"イントタグの 'name', 'cmt' または 'desc' 属性が画像のファイル名と一致したとき" +"に行われます。" #. Plugin lakewalker -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "WMS イメージのベクトル化を支援する" #. Plugin livegps -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -14987,25 +15338,29 @@ #. Plugin measurement -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " "segments, area surrounded by a (simple) closed way and create measurement " "paths (which also can be imported from a gps layer)." -msgstr "選択したパスの長さ、角度、簡単な領域内の面積を表示するダイアログとレイヤーを追加します。" +msgstr "" +"選択したパスの長さ、角度、簡単な領域内の面積を表示するダイアログとレイヤーを" +"追加します。" #. Plugin michigan_left -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:35 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "4 または5のウェイのセットに左折禁止を追加" #. Plugin multipoly -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:37 msgid "" "Create multipolygons by one click, much easier than standard way with " "relation editor." -msgstr "マルチポリゴンをワンクリックで作成し、リレーションエディタによる通常のやり方よりはるかに簡単です。" +msgstr "" +"マルチポリゴンをワンクリックで作成し、リレーションエディタによる通常のやり方" +"よりはるかに簡単です。" #. 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 " @@ -15013,19 +15368,22 @@ "mouse moving (general Java - tablet problem)." msgstr "" -"小さく短いドラッッグ時にクリックとみなします。これはタブレットペンを使用していて、マウス動作なしでタブレットをクリックするのに問題がある時に役に立ちます。" -"（一般的な Java - タブレット問題）" +"小さく短いドラッッグ時にクリックとみなします。これはタブレットペンを使用して" +"いて、マウス動作なしでタブレットをクリックするのに問題がある時に役に立ちま" +"す。（一般的な Java - タブレット問題）" #. Plugin openlayers -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:41 msgid "Displays an OpenLayers background image" msgstr "OpenLayers の背景画面を表示" #. Plugin openstreetbugs +#: build/trans_plugins.java:43 +msgid "Imports issues from OpenStreetBugs" +msgstr "" +"OpenStreetBugs のバグ情報を読んだり、新たにバグを報告したりできるようにしま" +"す。" + +#. Plugin openvisible #: build/trans_plugins.java:45 -msgid "Imports issues from OpenStreetBugs" -msgstr "OpenStreetBugs のバグ情報を読んだり、新たにバグを報告したりできるようにします。" - -#. Plugin openvisible -#: build/trans_plugins.java:47 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -15033,59 +15391,66 @@ #. Plugin osmarender +#: build/trans_plugins.java:47 +msgid "" +"Launches FireFox to display the current visible screen as a nice SVG image." +msgstr "" +"現在表示されているスクリーンを、きれいなSVG画像として表示されるように、" +"Firefoxを起動する。" + +#. Plugin PicLayer #: build/trans_plugins.java:49 -msgid "" -"Launches FireFox to display the current visible screen as a nice SVG image." -msgstr "現在表示されているスクリーンを、きれいなSVG画像として表示されるように、Firefoxを起動する。" - -#. Plugin PicLayer -#: build/trans_plugins.java:51 msgid "" "This plugin allows to display any picture as a background in the editor and " "align it with the map." -msgstr "このプラグインでは編集画面の背景として任意の画像を表示し、地図と並べることができます。" +msgstr "" +"このプラグインでは編集画面の背景として任意の画像を表示し、地図と並べることが" +"できます。" #. Plugin plastic_laf -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:51 msgid "The great JGoodies Plastic Look and Feel." msgstr "偉大なJGoodies のプラスティック風のルック＆フィール。" #. Plugin remotecontrol -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:53 msgid "Let other applications send commands to JOSM." msgstr "他のアプリーケーションにJOSM へのコマンドを送信させる" #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " "defined in routes.xml file in plugin directory" msgstr "" -"ルートを描画（公共バス、ハイキングコース、サイクリングコース、..）。ルートのタイプはplugin ディレクトリのroute.xml " -"ファイルに定義されていなければなりません" +"ルートを描画（公共バス、ハイキングコース、サイクリングコース、..）。ルートの" +"タイプはplugin ディレクトリのroute.xml ファイルに定義されていなければなりませ" +"ん" #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:57 msgid "Provides routing capabilities." msgstr "ルーティング能力の提供" #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:59 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " "background and request updates." -msgstr "JOSM のスリッピーマップグリッドを表示。スリッピーマップからタイルを背景としてロードし、更新を要求できます。" +msgstr "" +"JOSM のスリッピーマップグリッドを表示。スリッピーマップからタイルを背景として" +"ロードし、更新を要求できます。" #. Plugin surveyor -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:61 msgid "Allow adding markers/nodes on current gps positions." msgstr "現在のGPSポジションで、マーカー/ノードの追加を許可" #. Plugin tageditor -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:63 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "表形式でタグ編集のダイアログ・ボックスを提供" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:65 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -15093,42 +15458,38 @@ "the jar-file as standalone as well." msgstr "" -"ヘルプメニューにタグ付けプリセットテスターを追加します。これはタグ付けプリセットの手助けになります(ポップアップダイアログによるクイックレビュー)。jar" -" ファイルも同様にスタンドアロンとして起動できます。" +"ヘルプメニューにタグ付けプリセットテスターを追加します。これはタグ付けプリ" +"セットの手助けになります(ポップアップダイアログによるクイックレビュー)。jar " +"ファイルも同様にスタンドアロンとして起動できます。" #. Plugin terracer -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:67 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 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " "for the common ones. Spellcheck integrated for tag names." -msgstr "OSM データ妥当性検証。データ中の問題をチェックし、一般的な解決法を提供します。タグ名用にスペルチェック機能が統合されています。" +msgstr "" +"OSM データ妥当性検証。データ中の問題をチェックし、一般的な解決法を提供しま" +"す。タグ名用にスペルチェック機能が統合されています。" #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " "plugin is still under early development and may be buggy." msgstr "" -"タイルのダウンロード、walking-papers.org " -"からのスキャンされた地図のサポート。このプラグインはまだ初期開発バージョンなのでバグ含みかもしれません。" +"タイルのダウンロード、walking-papers.org からのスキャンされた地図のサポート。" +"このプラグインはまだ初期開発バージョンなのでバグ含みかもしれません。" #. 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, ...)." @@ -16181,8 +16542,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16379,5 +16740,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16387,5 +16748,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16404,5 +16765,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16412,5 +16773,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16429,5 +16790,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16437,5 +16798,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16454,5 +16815,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16462,5 +16823,5 @@ #. 300000 #. -#. +#. #. #. @@ -16475,5 +16836,5 @@ #. 300000 #. -#. +#. #. #. @@ -16491,5 +16852,5 @@ #. 50000 #. -#. +#. #. #. @@ -16507,5 +16868,5 @@ #. 40000 #. -#. +#. #. #. @@ -16514,5 +16875,5 @@ #. 40000 #. -#. +#. #. #. @@ -16522,5 +16883,5 @@ #. 50000 #. -#. +#. #. #. @@ -16540,5 +16901,5 @@ #. 50000 #. -#. +#. #. #. @@ -16547,5 +16908,5 @@ #. 50000 #. -#. +#. #. #. @@ -16555,5 +16916,5 @@ #. 50000 #. -#. +#. #. #. @@ -16603,7 +16964,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17304,5 +17665,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17341,5 +17702,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17435,5 +17796,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17591,5 +17952,5 @@ #. 50000 #. -#. +#. #. #. @@ -18976,5 +19337,5 @@ #. 30000 #. -#. +#. #. #. @@ -18984,5 +19345,5 @@ #. 40000 #. -#. +#. #. #. @@ -18992,5 +19353,5 @@ #. 20000 #. -#. +#. #. #. @@ -19000,5 +19361,5 @@ #. 40000 #. -#. +#. #. #. @@ -19356,7 +19717,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19366,5 +19727,5 @@ #. 50000 #. -#. +#. #. #. @@ -19374,5 +19735,5 @@ #. 50000 #. -#. +#. #. #. @@ -19382,5 +19743,5 @@ #. 50000 #. -#. +#. #. #. @@ -19390,5 +19751,5 @@ #. 50000 #. -#. +#. #. #. @@ -19398,5 +19759,5 @@ #. 50000 #. -#. +#. #. #. @@ -19406,5 +19767,5 @@ #. 50000 #. -#. +#. #. #. @@ -19414,5 +19775,5 @@ #. 50000 #. -#. +#. #. #. @@ -19422,5 +19783,5 @@ #. 50000 #. -#. +#. #. #. @@ -19430,5 +19791,5 @@ #. 50000 #. -#. +#. #. #. @@ -19438,5 +19799,5 @@ #. 50000 #. -#. +#. #. #. @@ -19446,5 +19807,5 @@ #. 50000 #. -#. +#. #. #. @@ -19454,5 +19815,5 @@ #. 50000 #. -#. +#. #. #. @@ -19462,5 +19823,5 @@ #. 50000 #. -#. +#. #. #. @@ -19470,5 +19831,5 @@ #. 50000 #. -#. +#. #. #. @@ -19478,5 +19839,5 @@ #. 50000 #. -#. +#. #. #. @@ -19486,5 +19847,5 @@ #. 50000 #. -#. +#. #. #. @@ -19494,5 +19855,5 @@ #. 50000 #. -#. +#. #. #. @@ -19502,5 +19863,5 @@ #. 50000 #. -#. +#. #. #. @@ -19510,5 +19871,5 @@ #. 50000 #. -#. +#. #. #. @@ -19518,5 +19879,5 @@ #. 50000 #. -#. +#. #. #. @@ -19526,5 +19887,5 @@ #. 50000 #. -#. +#. #. #. @@ -19534,5 +19895,5 @@ #. 50000 #. -#. +#. #. #. @@ -19542,5 +19903,5 @@ #. 50000 #. -#. +#. #. #. @@ -19550,5 +19911,5 @@ #. 50000 #. -#. +#. #. #. @@ -19558,5 +19919,5 @@ #. 50000 #. -#. +#. #. #. @@ -19566,5 +19927,5 @@ #. 50000 #. -#. +#. #. #. @@ -19574,5 +19935,5 @@ #. 50000 #. -#. +#. #. #. @@ -19582,5 +19943,5 @@ #. 50000 #. -#. +#. #. #. @@ -19590,5 +19951,5 @@ #. 50000 #. -#. +#. #. #. @@ -19598,5 +19959,5 @@ #. 50000 #. -#. +#. #. #. @@ -19606,5 +19967,5 @@ #. 50000 #. -#. +#. #. #. @@ -19614,5 +19975,5 @@ #. 50000 #. -#. +#. #. #. @@ -19622,5 +19983,5 @@ #. 50000 #. -#. +#. #. #. @@ -19630,5 +19991,5 @@ #. 50000 #. -#. +#. #. #. @@ -19638,5 +19999,5 @@ #. 50000 #. -#. +#. #. #. @@ -19646,5 +20007,5 @@ #. 50000 #. -#. +#. #. #. @@ -19654,5 +20015,5 @@ #. 50000 #. -#. +#. #. #. @@ -19662,5 +20023,5 @@ #. 50000 #. -#. +#. #. #. @@ -19670,5 +20031,5 @@ #. 50000 #. -#. +#. #. #. @@ -19678,5 +20039,5 @@ #. 50000 #. -#. +#. #. #. @@ -19686,5 +20047,5 @@ #. 50000 #. -#. +#. #. #. @@ -19694,5 +20055,5 @@ #. 50000 #. -#. +#. #. #. @@ -19702,5 +20063,5 @@ #. 50000 #. -#. +#. #. #. @@ -19710,5 +20071,5 @@ #. 50000 #. -#. +#. #. #. @@ -19718,5 +20079,5 @@ #. 50000 #. -#. +#. #. #. @@ -19726,5 +20087,5 @@ #. 50000 #. -#. +#. #. #. @@ -21419,7 +21780,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21429,5 +21790,5 @@ #. 50000 #. -#. +#. #. #. @@ -21437,5 +21798,5 @@ #. 50000 #. -#. +#. #. #. @@ -21445,5 +21806,5 @@ #. 50000 #. -#. +#. #. #. @@ -21453,5 +21814,5 @@ #. 50000 #. -#. +#. #. #. @@ -21461,5 +21822,5 @@ #. 50000 #. -#. +#. #. #. @@ -21469,5 +21830,5 @@ #. 50000 #. -#. +#. #. #. @@ -21477,5 +21838,5 @@ #. 50000 #. -#. +#. #. #. @@ -22806,5 +23167,5 @@ #. 40000 #. -#. +#. #. #. @@ -22820,5 +23181,5 @@ #. 30000 #. -#. +#. #. #. @@ -22829,7 +23190,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22839,5 +23200,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22847,13 +23216,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22863,5 +23224,5 @@ #. 50000 #. -#. +#. #. #. @@ -22894,5 +23255,5 @@ #. 50000 #. -#. +#. #. #. @@ -22908,5 +23269,5 @@ #. 50000 #. -#. +#. #. #. @@ -22916,5 +23277,5 @@ #. 10000 #. -#. +#. #. #. @@ -22924,5 +23285,5 @@ #. 10000 #. -#. +#. #. #. @@ -22933,5 +23294,5 @@ #. 10000 #. -#. +#. #. #. @@ -22960,5 +23321,5 @@ #. 50000 #. -#. +#. #. #. @@ -23073,9 +23434,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 @@ -23083,5 +23444,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, @@ -23091,8 +23452,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 @@ -23106,5 +23467,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23112,5 +23473,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23159,6 +23520,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23238,5 +23599,5 @@ #. 40000 #. -#. +#. #. #. @@ -23246,5 +23607,5 @@ #. 10000 #. -#. +#. #. #. @@ -23253,5 +23614,5 @@ #. 50000 #. -#. +#. #. #. @@ -23261,5 +23622,5 @@ #. 50000 #. -#. +#. #. #. @@ -23268,5 +23629,5 @@ #. 50000 #. -#. +#. #. #. @@ -23275,5 +23636,5 @@ #. 50000 #. -#. +#. #. #. @@ -23282,5 +23643,5 @@ #. 50000 #. -#. +#. #. #. @@ -23289,5 +23650,5 @@ #. 50000 #. -#. +#. #. #. @@ -23296,5 +23657,5 @@ #. 40000 #. -#. +#. #. #. @@ -23303,5 +23664,5 @@ #. 50000 #. -#. +#. #. #. @@ -23310,5 +23671,5 @@ #. 50000 #. -#. +#. #. #. @@ -23317,5 +23678,5 @@ #. 50000 #. -#. +#. #. #. @@ -23324,5 +23685,5 @@ #. 50000 #. -#. +#. #. #. @@ -23331,5 +23692,5 @@ #. 50000 #. -#. +#. #. #. @@ -23338,5 +23699,5 @@ #. 50000 #. -#. +#. #. #. @@ -23346,5 +23707,5 @@ #. 50000 #. -#. +#. #. #. @@ -23353,5 +23714,5 @@ #. 50000 #. -#. +#. #. #. @@ -23362,5 +23723,5 @@ #. 50000 #. -#. +#. #. #. @@ -23372,11 +23733,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23385,7 +23746,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23396,5 +23757,5 @@ #. 50000 #. -#. +#. #. #. @@ -23405,5 +23766,5 @@ #. 50000 #. -#. +#. #. #. @@ -23414,5 +23775,5 @@ #. 50000 #. -#. +#. #. #. @@ -23423,5 +23784,5 @@ #. 50000 #. -#. +#. #. #. @@ -23432,5 +23793,5 @@ #. 50000 #. -#. +#. #. #. @@ -23441,5 +23802,5 @@ #. 40000 #. -#. +#. #. #. @@ -23451,5 +23812,5 @@ #. 50000 #. -#. +#. #. #. @@ -23460,5 +23821,5 @@ #. 50000 #. -#. +#. #. #. @@ -23483,5 +23844,5 @@ #. 10000 #. -#. +#. #. #. @@ -23490,5 +23851,5 @@ #. 50000 #. -#. +#. #. #. @@ -23497,5 +23858,5 @@ #. 50000 #. -#. +#. #. #. @@ -23511,5 +23872,5 @@ #. 20000 #. -#. +#. #. #. @@ -23523,5 +23884,5 @@ #. 30000 #. -#. +#. #. #. @@ -23530,5 +23891,5 @@ #. 50000 #. -#. +#. #. #. @@ -23537,5 +23898,5 @@ #. 50000 #. -#. +#. #. #. @@ -23544,5 +23905,5 @@ #. 50000 #. -#. +#. #. #. @@ -23551,5 +23912,5 @@ #. 50000 #. -#. +#. #. #. @@ -23558,5 +23919,5 @@ #. 50000 #. -#. +#. #. #. @@ -23565,5 +23926,5 @@ #. 50000 #. -#. +#. #. #. @@ -23572,5 +23933,5 @@ #. 50000 #. -#. +#. #. #. @@ -23579,5 +23940,5 @@ #. 50000 #. -#. +#. #. #. @@ -23586,5 +23947,5 @@ #. 50000 #. -#. +#. #. #. @@ -23593,5 +23954,5 @@ #. 50000 #. -#. +#. #. #. @@ -23600,5 +23961,5 @@ #. 50000 #. -#. +#. #. #. @@ -23607,5 +23968,5 @@ #. 50000 #. -#. +#. #. #. @@ -23614,5 +23975,5 @@ #. 50000 #. -#. +#. #. #. @@ -23621,5 +23982,5 @@ #. 50000 #. -#. +#. #. #. @@ -23790,7 +24151,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23804,5 +24165,5 @@ #. 40000 #. -#. +#. #. #. @@ -23812,7 +24173,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23822,5 +24183,5 @@ #. 50000 #. -#. +#. #. #. @@ -23830,5 +24191,5 @@ #. 50000 #. -#. +#. #. #. @@ -23838,5 +24199,5 @@ #. 50000 #. -#. +#. #. #. @@ -23846,5 +24207,5 @@ #. 50000 #. -#. +#. #. #. @@ -23860,5 +24221,5 @@ #. 10000 #. -#. +#. #. #. @@ -23868,5 +24229,5 @@ #. 50000 #. -#. +#. #. #. @@ -23876,5 +24237,5 @@ #. 50000 #. -#. +#. #. #. @@ -23884,5 +24245,5 @@ #. 50000 #. -#. +#. #. #. @@ -23892,5 +24253,5 @@ #. 50000 #. -#. +#. #. #. @@ -23900,5 +24261,5 @@ #. 50000 #. -#. +#. #. #. @@ -23908,5 +24269,5 @@ #. 50000 #. -#. +#. #. #. @@ -23925,5 +24286,5 @@ #. 50000 #. -#. +#. #. #. @@ -23932,5 +24293,5 @@ #. 50000 #. -#. +#. #. #. @@ -23944,5 +24305,5 @@ #. 50000 #. -#. +#. #. #. @@ -23956,5 +24317,5 @@ #. 50000 #. -#. +#. #. #. @@ -23963,5 +24324,5 @@ #. 50000 #. -#. +#. #. #. @@ -23975,5 +24336,5 @@ #. 50000 #. -#. +#. #. #. @@ -23988,5 +24349,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24001,5 +24362,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24013,5 +24374,5 @@ #. 50000 #. -#. +#. #. #. @@ -24025,5 +24386,5 @@ #. 50000 #. -#. +#. #. #. @@ -24032,5 +24393,5 @@ #. 50000 #. -#. +#. #. #. @@ -24039,5 +24400,5 @@ #. 50000 #. -#. +#. #. #. @@ -24051,5 +24412,5 @@ #. 50000 #. -#. +#. #. #. @@ -24059,5 +24420,5 @@ #. 50000 #. -#. +#. #. #. @@ -24066,5 +24427,5 @@ #. 50000 #. -#. +#. #. #. @@ -24073,5 +24434,5 @@ #. 50000 #. -#. +#. #. #. @@ -24080,5 +24441,5 @@ #. 50000 #. -#. +#. #. #. @@ -24088,5 +24449,5 @@ #. 50000 #. -#. +#. #. #. @@ -24097,5 +24458,5 @@ #. 50000 #. -#. +#. #. #. @@ -24105,7 +24466,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24115,5 +24476,5 @@ #. 50000 #. -#. +#. #. #. @@ -24123,5 +24484,5 @@ #. 50000 #. -#. +#. #. #. @@ -24131,5 +24492,5 @@ #. 50000 #. -#. +#. #. #. @@ -24140,5 +24501,5 @@ #. 50000 #. -#. +#. #. #. @@ -24148,5 +24509,5 @@ #. 50000 #. -#. +#. #. #. @@ -24156,5 +24517,5 @@ #. 50000 #. -#. +#. #. #. @@ -24164,5 +24525,5 @@ #. 50000 #. -#. +#. #. #. @@ -24172,5 +24533,5 @@ #. 50000 #. -#. +#. #. #. @@ -24180,5 +24541,5 @@ #. 50000 #. -#. +#. #. #. @@ -24188,5 +24549,5 @@ #. 50000 #. -#. +#. #. #. @@ -24196,5 +24557,5 @@ #. 50000 #. -#. +#. #. #. @@ -24204,5 +24565,5 @@ #. 50000 #. -#. +#. #. #. @@ -24225,7 +24586,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24235,5 +24596,5 @@ #. 50000 #. -#. +#. #. #. @@ -24242,5 +24603,5 @@ #. 50000 #. -#. +#. #. #. @@ -24250,5 +24611,5 @@ #. 50000 #. -#. +#. #. #. @@ -24257,5 +24618,5 @@ #. 50000 #. -#. +#. #. #. @@ -24265,5 +24626,5 @@ #. 50000 #. -#. +#. #. #. @@ -24273,5 +24634,5 @@ #. 50000 #. -#. +#. #. #. @@ -24287,5 +24648,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24296,5 +24657,5 @@ #. 50000 #. -#. +#. #. #. @@ -24313,5 +24674,5 @@ #. 50000 #. -#. +#. #. #. @@ -24321,5 +24682,5 @@ #. 50000 #. -#. +#. #. #. @@ -24332,5 +24693,5 @@ #. 50000 #. -#. +#. #. #. @@ -24348,5 +24709,5 @@ #. 50000 #. -#. +#. #. #. @@ -24355,5 +24716,5 @@ #. 50000 #. -#. +#. #. #. @@ -24362,5 +24723,5 @@ #. 50000 #. -#. +#. #. #. @@ -24369,7 +24730,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24380,5 +24741,5 @@ #. 50000 #. -#. +#. #. #. @@ -24393,5 +24754,5 @@ #. 50000 #. -#. +#. #. #. @@ -24405,5 +24766,5 @@ #. 50000 #. -#. +#. #. #. @@ -24413,5 +24774,5 @@ #. 50000 #. -#. +#. #. #. @@ -24425,5 +24786,5 @@ #. 50000 #. -#. +#. #. #. @@ -24437,5 +24798,5 @@ #. 50000 #. -#. +#. #. #. @@ -24444,7 +24805,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24454,5 +24815,5 @@ #. 50000 #. -#. +#. #. #. @@ -24462,5 +24823,5 @@ #. 50000 #. -#. +#. #. #. @@ -24470,5 +24831,5 @@ #. 50000 #. -#. +#. #. #. @@ -24478,5 +24839,5 @@ #. 50000 #. -#. +#. #. #. @@ -24492,7 +24853,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24507,5 +24868,5 @@ #. 30000 #. -#. +#. #. #. @@ -24520,5 +24881,5 @@ #. 30000 #. -#. +#. #. #. @@ -24533,5 +24894,5 @@ #. 30000 #. -#. +#. #. #. @@ -24546,5 +24907,5 @@ #. 30000 #. -#. +#. #. #. @@ -24559,5 +24920,5 @@ #. 30000 #. -#. +#. #. #. @@ -24572,7 +24933,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24582,5 +24943,5 @@ #. 50000 #. -#. +#. #. #. @@ -24589,5 +24950,5 @@ #. 50000 #. -#. +#. #. #. @@ -24597,5 +24958,5 @@ #. 50000 #. -#. +#. #. #. @@ -24605,5 +24966,5 @@ #. 50000 #. -#. +#. #. #. @@ -24613,5 +24974,5 @@ #. 50000 #. -#. +#. #. #. @@ -24621,5 +24982,5 @@ #. 50000 #. -#. +#. #. #. @@ -24629,5 +24990,5 @@ #. 50000 #. -#. +#. #. #. @@ -24637,5 +24998,5 @@ #. 50000 #. -#. +#. #. #. @@ -24645,5 +25006,5 @@ #. 50000 #. -#. +#. #. #. @@ -24653,5 +25014,5 @@ #. 50000 #. -#. +#. #. #. @@ -24661,5 +25022,5 @@ #. 50000 #. -#. +#. #. #. @@ -24669,5 +25030,5 @@ #. 50000 #. -#. +#. #. #. @@ -24677,5 +25038,5 @@ #. 50000 #. -#. +#. #. #. @@ -24695,5 +25056,5 @@ #. 50000 #. -#. +#. #. #. @@ -24708,5 +25069,5 @@ #. 50000 #. -#. +#. #. #. @@ -24719,7 +25080,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24729,5 +25090,5 @@ #. 50000 #. -#. +#. #. #. @@ -24737,5 +25098,5 @@ #. 50000 #. -#. +#. #. #. @@ -24745,5 +25106,5 @@ #. 50000 #. -#. +#. #. #. @@ -24753,5 +25114,5 @@ #. 50000 #. -#. +#. #. #. @@ -24761,5 +25122,5 @@ #. 50000 #. -#. +#. #. #. @@ -24769,5 +25130,5 @@ #. 50000 #. -#. +#. #. #. @@ -24777,5 +25138,5 @@ #. 50000 #. -#. +#. #. #. @@ -24785,5 +25146,5 @@ #. 50000 #. -#. +#. #. #. @@ -24793,5 +25154,5 @@ #. 50000 #. -#. +#. #. #. @@ -24801,5 +25162,5 @@ #. 50000 #. -#. +#. #. #. @@ -24809,5 +25170,5 @@ #. 50000 #. -#. +#. #. #. @@ -24817,5 +25178,5 @@ #. 50000 #. -#. +#. #. #. @@ -24825,5 +25186,5 @@ #. 50000 #. -#. +#. #. #. @@ -24833,5 +25194,5 @@ #. 50000 #. -#. +#. #. #. @@ -24852,5 +25213,5 @@ #. 50000 #. -#. +#. #. #. @@ -24864,7 +25225,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24874,5 +25235,5 @@ #. 50000 #. -#. +#. #. #. @@ -24882,5 +25243,5 @@ #. 50000 #. -#. +#. #. #. @@ -24890,5 +25251,5 @@ #. 50000 #. -#. +#. #. #. @@ -24898,5 +25259,5 @@ #. 50000 #. -#. +#. #. #. @@ -24906,5 +25267,5 @@ #. 50000 #. -#. +#. #. #. @@ -24914,5 +25275,5 @@ #. 50000 #. -#. +#. #. #. @@ -24922,5 +25283,5 @@ #. 50000 #. -#. +#. #. #. @@ -24937,5 +25298,5 @@ #. 50000 #. -#. +#. #. #. @@ -24945,5 +25306,5 @@ #. 50000 #. -#. +#. #. #. @@ -24953,5 +25314,5 @@ #. 50000 #. -#. +#. #. #. @@ -24961,5 +25322,5 @@ #. 50000 #. -#. +#. #. #. @@ -24969,5 +25330,5 @@ #. 50000 #. -#. +#. #. #. @@ -24977,5 +25338,5 @@ #. 50000 #. -#. +#. #. #. @@ -24985,5 +25346,5 @@ #. 50000 #. -#. +#. #. #. @@ -24993,5 +25354,5 @@ #. 50000 #. -#. +#. #. #. @@ -25001,5 +25362,5 @@ #. 50000 #. -#. +#. #. #. @@ -25009,5 +25370,5 @@ #. 50000 #. -#. +#. #. #. @@ -25017,5 +25378,5 @@ #. 50000 #. -#. +#. #. #. @@ -25025,5 +25386,5 @@ #. 50000 #. -#. +#. #. #. @@ -25042,5 +25403,5 @@ #. 50000 #. -#. +#. #. #. @@ -25050,5 +25411,5 @@ #. 50000 #. -#. +#. #. #. @@ -25057,5 +25418,5 @@ #. 50000 #. -#. +#. #. #. @@ -25065,5 +25426,5 @@ #. 50000 #. -#. +#. #. #. @@ -25073,5 +25434,5 @@ #. 50000 #. -#. +#. #. #. @@ -25081,5 +25442,5 @@ #. 50000 #. -#. +#. #. #. @@ -25088,5 +25449,5 @@ #. 50000 #. -#. +#. #. #. @@ -25096,5 +25457,5 @@ #. 50000 #. -#. +#. #. #. @@ -25104,5 +25465,5 @@ #. 50000 #. -#. +#. #. #. @@ -25112,5 +25473,5 @@ #. 50000 #. -#. +#. #. #. @@ -25120,5 +25481,5 @@ #. 50000 #. -#. +#. #. #. @@ -25127,5 +25488,5 @@ #. 50000 #. -#. +#. #. #. @@ -25134,5 +25495,5 @@ #. 50000 #. -#. +#. #. #. @@ -25141,5 +25502,5 @@ #. 50000 #. -#. +#. #. #. @@ -25148,5 +25509,5 @@ #. 50000 #. -#. +#. #. #. @@ -25155,5 +25516,5 @@ #. 50000 #. -#. +#. #. #. @@ -25162,5 +25523,5 @@ #. 50000 #. -#. +#. #. #. @@ -25169,5 +25530,5 @@ #. 50000 #. -#. +#. #. #. @@ -25176,5 +25537,5 @@ #. 50000 #. -#. +#. #. #. @@ -25183,5 +25544,5 @@ #. 50000 #. -#. +#. #. #. @@ -25190,5 +25551,5 @@ #. 50000 #. -#. +#. #. #. @@ -25197,5 +25558,5 @@ #. 50000 #. -#. +#. #. #. @@ -25204,5 +25565,5 @@ #. 50000 #. -#. +#. #. #. @@ -25211,5 +25572,5 @@ #. 50000 #. -#. +#. #. #. @@ -25219,5 +25580,5 @@ #. 50000 #. -#. +#. #. #. @@ -25227,5 +25588,5 @@ #. 50000 #. -#. +#. #. #. @@ -25235,5 +25596,5 @@ #. 50000 #. -#. +#. #. #. @@ -25243,5 +25604,5 @@ #. 50000 #. -#. +#. #. #. @@ -25251,5 +25612,5 @@ #. 50000 #. -#. +#. #. #. @@ -25259,5 +25620,5 @@ #. 50000 #. -#. +#. #. #. @@ -25267,5 +25628,5 @@ #. 50000 #. -#. +#. #. #. @@ -25275,5 +25636,5 @@ #. 50000 #. -#. +#. #. #. @@ -25283,5 +25644,5 @@ #. 50000 #. -#. +#. #. #. @@ -25292,5 +25653,5 @@ #. 50000 #. -#. +#. #. #. @@ -25300,5 +25661,5 @@ #. 50000 #. -#. +#. #. #. @@ -25308,5 +25669,5 @@ #. 50000 #. -#. +#. #. #. @@ -25316,5 +25677,5 @@ #. 50000 #. -#. +#. #. #. @@ -25324,5 +25685,5 @@ #. 50000 #. -#. +#. #. #. @@ -25332,5 +25693,5 @@ #. 50000 #. -#. +#. #. #. @@ -25340,5 +25701,5 @@ #. 50000 #. -#. +#. #. #. @@ -25348,5 +25709,5 @@ #. 50000 #. -#. +#. #. #. @@ -25356,5 +25717,5 @@ #. 50000 #. -#. +#. #. #. @@ -25364,5 +25725,5 @@ #. 50000 #. -#. +#. #. #. @@ -25372,5 +25733,5 @@ #. 50000 #. -#. +#. #. #. @@ -25380,5 +25741,5 @@ #. 50000 #. -#. +#. #. #. @@ -25388,5 +25749,5 @@ #. 50000 #. -#. +#. #. #. @@ -25396,5 +25757,5 @@ #. 50000 #. -#. +#. #. #. @@ -25404,5 +25765,5 @@ #. 50000 #. -#. +#. #. #. @@ -25412,5 +25773,5 @@ #. 50000 #. -#. +#. #. #. @@ -25420,5 +25781,5 @@ #. 50000 #. -#. +#. #. #. @@ -25428,5 +25789,5 @@ #. 50000 #. -#. +#. #. #. @@ -25436,5 +25797,5 @@ #. 50000 #. -#. +#. #. #. @@ -25443,5 +25804,5 @@ #. 50000 #. -#. +#. #. #. @@ -25473,5 +25834,5 @@ #. 50000 #. -#. +#. #. #. @@ -25481,5 +25842,5 @@ #. 50000 #. -#. +#. #. #. @@ -25489,7 +25850,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25504,5 +25865,5 @@ #. 50000 #. -#. +#. #. #. @@ -25512,5 +25873,5 @@ #. 50000 #. -#. +#. #. #. @@ -25520,5 +25881,5 @@ #. 50000 #. -#. +#. #. #. @@ -25528,5 +25889,5 @@ #. 50000 #. -#. +#. #. #. @@ -25536,5 +25897,5 @@ #. 50000 #. -#. +#. #. #. @@ -25544,5 +25905,5 @@ #. 50000 #. -#. +#. #. #. @@ -25552,5 +25913,5 @@ #. 50000 #. -#. +#. #. #. @@ -25566,7 +25927,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25576,5 +25937,5 @@ #. 50000 #. -#. +#. #. #. @@ -25584,5 +25945,5 @@ #. 50000 #. -#. +#. #. #. @@ -25592,5 +25953,5 @@ #. 50000 #. -#. +#. #. #. @@ -25600,5 +25961,5 @@ #. 50000 #. -#. +#. #. #. @@ -25608,5 +25969,5 @@ #. 50000 #. -#. +#. #. #. @@ -25616,5 +25977,5 @@ #. 50000 #. -#. +#. #. #. @@ -25624,5 +25985,5 @@ #. 50000 #. -#. +#. #. #. @@ -25632,5 +25993,5 @@ #. 50000 #. -#. +#. #. #. @@ -25640,5 +26001,5 @@ #. 50000 #. -#. +#. #. #. @@ -25648,5 +26009,5 @@ #. 50000 #. -#. +#. #. #. @@ -25656,5 +26017,5 @@ #. 50000 #. -#. +#. #. #. @@ -25664,5 +26025,5 @@ #. 50000 #. -#. +#. #. #. @@ -25672,5 +26033,5 @@ #. 50000 #. -#. +#. #. #. @@ -25680,5 +26041,5 @@ #. 50000 #. -#. +#. #. #. @@ -25688,5 +26049,5 @@ #. 50000 #. -#. +#. #. #. @@ -25696,5 +26057,5 @@ #. 50000 #. -#. +#. #. #. @@ -25704,5 +26065,5 @@ #. 50000 #. -#. +#. #. #. @@ -25712,5 +26073,5 @@ #. 50000 #. -#. +#. #. #. @@ -25720,5 +26081,5 @@ #. 50000 #. -#. +#. #. #. @@ -25728,5 +26089,5 @@ #. 50000 #. -#. +#. #. #. @@ -25736,5 +26097,5 @@ #. 50000 #. -#. +#. #. #. @@ -25744,5 +26105,5 @@ #. 50000 #. -#. +#. #. #. @@ -25752,5 +26113,5 @@ #. 50000 #. -#. +#. #. #. @@ -25760,5 +26121,5 @@ #. 50000 #. -#. +#. #. #. @@ -25768,5 +26129,5 @@ #. 50000 #. -#. +#. #. #. @@ -25776,5 +26137,5 @@ #. 50000 #. -#. +#. #. #. @@ -25784,5 +26145,5 @@ #. 50000 #. -#. +#. #. #. @@ -25792,5 +26153,5 @@ #. 50000 #. -#. +#. #. #. @@ -25800,5 +26161,5 @@ #. 50000 #. -#. +#. #. #. @@ -25808,5 +26169,5 @@ #. 50000 #. -#. +#. #. #. @@ -25816,5 +26177,5 @@ #. 50000 #. -#. +#. #. #. @@ -25824,5 +26185,5 @@ #. 50000 #. -#. +#. #. #. @@ -25832,5 +26193,5 @@ #. 50000 #. -#. +#. #. #. @@ -25840,5 +26201,5 @@ #. 50000 #. -#. +#. #. #. @@ -25848,5 +26209,5 @@ #. 50000 #. -#. +#. #. #. @@ -25856,5 +26217,5 @@ #. 50000 #. -#. +#. #. #. @@ -25864,5 +26225,5 @@ #. 50000 #. -#. +#. #. #. @@ -25872,5 +26233,5 @@ #. 50000 #. -#. +#. #. #. @@ -25880,5 +26241,5 @@ #. 50000 #. -#. +#. #. #. @@ -25888,5 +26249,5 @@ #. 50000 #. -#. +#. #. #. @@ -25896,5 +26257,5 @@ #. 50000 #. -#. +#. #. #. @@ -25904,5 +26265,5 @@ #. 50000 #. -#. +#. #. #. @@ -25938,7 +26299,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25948,5 +26309,5 @@ #. 50000 #. -#. +#. #. #. @@ -25956,5 +26317,5 @@ #. 50000 #. -#. +#. #. #. @@ -25964,5 +26325,5 @@ #. 50000 #. -#. +#. #. #. @@ -25972,5 +26333,5 @@ #. 50000 #. -#. +#. #. #. @@ -25980,5 +26341,5 @@ #. 50000 #. -#. +#. #. #. @@ -25988,5 +26349,5 @@ #. 50000 #. -#. +#. #. #. @@ -25996,5 +26357,5 @@ #. 50000 #. -#. +#. #. #. @@ -26011,5 +26372,5 @@ #. 50000 #. -#. +#. #. #. @@ -26019,5 +26380,5 @@ #. 50000 #. -#. +#. #. #. @@ -26027,5 +26388,5 @@ #. 50000 #. -#. +#. #. #. @@ -26035,5 +26396,5 @@ #. 50000 #. -#. +#. #. #. @@ -26043,5 +26404,5 @@ #. 50000 #. -#. +#. #. #. @@ -26051,5 +26412,5 @@ #. 50000 #. -#. +#. #. #. @@ -26060,5 +26421,5 @@ #. 50000 #. -#. +#. #. #. @@ -26068,5 +26429,5 @@ #. 50000 #. -#. +#. #. #. @@ -26076,5 +26437,5 @@ #. 40000 #. -#. +#. #. #. @@ -26084,5 +26445,5 @@ #. 50000 #. -#. +#. #. #. @@ -26091,5 +26452,5 @@ #. 40000 #. -#. +#. #. #. @@ -26098,5 +26459,5 @@ #. 40000 #. -#. +#. #. #. @@ -26114,7 +26475,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26124,5 +26485,5 @@ #. 50000 #. -#. +#. #. #. @@ -26132,5 +26493,5 @@ #. 50000 #. -#. +#. #. #. @@ -26140,5 +26501,5 @@ #. 50000 #. -#. +#. #. #. @@ -26148,5 +26509,5 @@ #. 50000 #. -#. +#. #. #. @@ -26156,5 +26517,5 @@ #. 50000 #. -#. +#. #. #. @@ -26164,5 +26525,5 @@ #. 50000 #. -#. +#. #. #. @@ -26172,5 +26533,5 @@ #. 50000 #. -#. +#. #. #. @@ -26180,5 +26541,5 @@ #. 50000 #. -#. +#. #. #. @@ -26188,5 +26549,5 @@ #. 50000 #. -#. +#. #. #. @@ -26205,5 +26566,5 @@ #. 50000 #. -#. +#. #. #. @@ -26217,5 +26578,5 @@ #. 50000 #. -#. +#. #. #. @@ -26229,5 +26590,5 @@ #. 50000 #. -#. +#. #. #. @@ -26237,5 +26598,5 @@ #. 50000 #. -#. +#. #. #. @@ -26249,5 +26610,5 @@ #. 50000 #. -#. +#. #. #. @@ -26261,5 +26622,5 @@ #. 50000 #. -#. +#. #. #. @@ -26273,6 +26634,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26282,5 +26643,5 @@ #. 50000 #. -#. +#. #. #. @@ -26294,5 +26655,5 @@ #. 50000 #. -#. +#. #. #. @@ -26306,5 +26667,5 @@ #. 50000 #. -#. +#. #. #. @@ -26318,5 +26679,5 @@ #. 50000 #. -#. +#. #. #. @@ -26330,5 +26691,5 @@ #. 50000 #. -#. +#. #. #. @@ -26342,5 +26703,5 @@ #. 50000 #. -#. +#. #. #. @@ -26350,7 +26711,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26360,5 +26721,5 @@ #. 50000 #. -#. +#. #. #. @@ -26368,5 +26729,5 @@ #. 50000 #. -#. +#. #. #. @@ -26376,5 +26737,5 @@ #. 50000 #. -#. +#. #. #. @@ -26384,5 +26745,5 @@ #. 50000 #. -#. +#. #. #. @@ -26399,5 +26760,5 @@ #. 50000 #. -#. +#. #. #. @@ -26410,5 +26771,5 @@ #. 50000 #. -#. +#. #. #. @@ -26422,5 +26783,5 @@ #. 50000 #. -#. +#. #. #. @@ -26434,5 +26795,5 @@ #. 50000 #. -#. +#. #. #. @@ -26446,5 +26807,5 @@ #. 50000 #. -#. +#. #. #. @@ -26455,5 +26816,5 @@ #. 50000 #. -#. +#. #. #. @@ -26463,5 +26824,5 @@ #. 50000 #. -#. +#. #. #. @@ -26471,5 +26832,5 @@ #. 50000 #. -#. +#. #. #. @@ -26479,5 +26840,5 @@ #. 50000 #. -#. +#. #. #. @@ -26487,5 +26848,5 @@ #. 50000 #. -#. +#. #. #. @@ -26502,5 +26863,5 @@ #. 50000 #. -#. +#. #. #. @@ -26514,5 +26875,5 @@ #. 50000 #. -#. +#. #. #. @@ -26526,5 +26887,5 @@ #. 50000 #. -#. +#. #. #. @@ -26538,5 +26899,5 @@ #. 50000 #. -#. +#. #. #. @@ -26550,5 +26911,5 @@ #. 50000 #. -#. +#. #. #. @@ -26562,5 +26923,5 @@ #. 50000 #. -#. +#. #. #. @@ -26569,7 +26930,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26579,5 +26940,5 @@ #. 50000 #. -#. +#. #. #. @@ -26587,5 +26948,5 @@ #. 50000 #. -#. +#. #. #. @@ -26595,5 +26956,5 @@ #. 50000 #. -#. +#. #. #. @@ -26603,5 +26964,5 @@ #. 50000 #. -#. +#. #. #. @@ -26611,5 +26972,5 @@ #. 50000 #. -#. +#. #. #. @@ -26619,5 +26980,5 @@ #. 50000 #. -#. +#. #. #. @@ -26627,5 +26988,5 @@ #. 50000 #. -#. +#. #. #. @@ -26642,7 +27003,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26652,5 +27013,5 @@ #. 50000 #. -#. +#. #. #. @@ -26660,5 +27021,5 @@ #. 50000 #. -#. +#. #. #. @@ -26668,5 +27029,5 @@ #. 50000 #. -#. +#. #. #. @@ -26676,5 +27037,5 @@ #. 50000 #. -#. +#. #. #. @@ -26690,5 +27051,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26737,5 +27098,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26745,5 +27106,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26753,5 +27114,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26761,5 +27122,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26769,5 +27130,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26777,5 +27138,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26785,5 +27146,5 @@ #. 50000 #. -#. +#. #. #. @@ -26793,5 +27154,5 @@ #. 50000 #. -#. +#. #. #. @@ -26801,5 +27162,5 @@ #. 50000 #. -#. +#. #. #. @@ -26809,5 +27170,5 @@ #. 50000 #. -#. +#. #. #. @@ -26817,5 +27178,5 @@ #. 50000 #. -#. +#. #. #. @@ -26825,5 +27186,5 @@ #. 50000 #. -#. +#. #. #. @@ -26843,5 +27204,5 @@ #. 50000 #. -#. +#. #. #. @@ -26850,5 +27211,5 @@ #. 50000 #. -#. +#. #. #. @@ -26857,5 +27218,5 @@ #. 50000 #. -#. +#. #. #. @@ -26864,5 +27225,5 @@ #. 40000 #. -#. +#. #. #. @@ -26871,5 +27232,5 @@ #. 40000 #. -#. +#. #. #. @@ -26878,5 +27239,5 @@ #. 40000 #. -#. +#. #. #. @@ -26971,5 +27332,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -26977,28 +27338,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 @@ -27113,5 +27474,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27124,5 +27485,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27147,6 +27508,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27155,6 +27516,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27169,6 +27530,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 @@ -27182,6 +27543,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 @@ -27201,6 +27562,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27224,6 +27585,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 @@ -27236,4 +27597,121 @@ msgstr "" +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません" + +#~ msgid "Download all incomplete ways and nodes in relation" +#~ msgstr "リレーション中の全ての不完全なウェイとノードをダウンロード" + +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ 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}×{2} から読み取ることができませんでした" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。" + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS開始: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS終了: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "現在の差分: {0} 秒" + +#~ msgid "timezone difference: " +#~ msgstr "タイムゾーンの違い: " + +#~ msgid "{0} within the track." +#~ msgstr "トラック内に {0}" + +#~ msgid "Sync clock" +#~ msgstr "時計の同期" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "ファイル \"{0}\"中の日付が取得できません。" + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。" + +#~ msgid "Image" +#~ msgstr "画像" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "GPSユニットのタイムゾーン(写真の時間との違い)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "時刻をGPSユニットと同期する" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "入力した時刻は、解釈できません" + +#~ msgid "" +#~ "WARNING: no API version defined for data to upload. Falling back to " +#~ "version 0.6" +#~ msgstr "" +#~ "警告: アップロードするデータにAPIバージョンが定義されていません。バージョ" +#~ "ン0.6 にフォールバックします。" + +#~ 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 "" +#~ "警告: 設定 ''{0}'' またはデータセットのAPI バージョン ''{1}'' では差分アッ" +#~ "プロードの使用が必須ですが、API は取扱えません。差分アップロードを無視しま" +#~ "す。" + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "" +#~ "{0} プラグインのロードが要求されました。このプラグインは今は必須ではありま" +#~ "せん。" + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "ジオタグのある写真" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "AgPifoJで画像を開く..." + +#~ msgid "osmarender options" +#~ msgstr "osmarenderオプション" + +#~ msgid "Group common Address Interpolation inputs in a single dialog," +#~ msgstr "グループ共通のアドレス補間をひとつのダイアログに入力します。" + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "標準とは別の JOSM 用ジオタグ plugin。GPS ログと、写真の EXIFに埋め込まれた" +#~ "ジオタグを関連づけします。" + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "あなたの人生をより楽なものにする数種のユーティリティ: 例、ウェイ簡素化、エ" +#~ "リア結合、ポジションへのジャンプ" + #~ msgid "Move" #~ msgstr "移動" @@ -27254,7 +27732,4 @@ #~ msgstr "最初にブックマークを選択してください、" -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "最初に目的の座標を入力してください。" - #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "ズームやパンにマウスやCtrl+Arrow キー/./を使います。" @@ -27290,26 +27765,27 @@ #~ msgstr "JOSMオンラインヘルプ" -#, java-format #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。" - -#, java-format +#~ msgstr[0] "" +#~ "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。" + #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." -#~ msgstr "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。" - -#, java-format +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。" + #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "{1}からプラグイン: {0}をダウンロードできません" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "プラグインはJPSMのアップデートを要求しています: {0}" #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." -#~ msgstr "バグの報告前にJOSMの最新バージョンとすべてのプラグインのアップデートをしてください。" +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." +#~ msgstr "" +#~ "バグの報告前にJOSMの最新バージョンとすべてのプラグインのアップデートをして" +#~ "ください。" #~ msgid "Include your steps to get to the error (as detailed as possible)!" @@ -27325,10 +27801,11 @@ #~ "Server returned internal error. Try a reduced area or retry after waiting " #~ "some time." -#~ msgstr "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小して試してください。" +#~ msgstr "" +#~ "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小し" +#~ "て試してください。" #~ msgid "Found element in non-relation." #~ msgstr "要素がリレーション以外に見つかりました" -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "存在しないノードを含むため、ウエイ {0} をスキップします\n" @@ -27341,5 +27818,7 @@ #~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れます。" +#~ msgstr "" +#~ "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れま" +#~ "す。" #~ msgid "Please enter a search string" @@ -27358,5 +27837,4 @@ #~ msgstr "取り消す" -#, java-format #~ msgid "Layers: {0}" #~ msgstr "レイヤー：{0}" @@ -27368,5 +27846,4 @@ #~ msgstr "OSMサーバに接続…" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "作者: {0}" @@ -27384,5 +27861,4 @@ #~ msgstr "ファイルが見つかりません" -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -27391,5 +27867,6 @@ #~ "{0}" #~ msgstr "" -#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダウンロードしますか？\n" +#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダ" +#~ "ウンロードしますか？\n" #~ "{0}" @@ -27397,8 +27874,4 @@ #~ msgstr "プラグインはすでに存在しています" -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Error deleting plugin file: {0}" - #~ msgid "Rotate" #~ msgstr "回転" @@ -27407,8 +27880,4 @@ #~ msgstr "更新" -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "削除 {1} {0}" - #~ msgid "true" #~ msgstr "真" @@ -27423,5 +27892,4 @@ #~ msgstr "差異" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "情報ディレクトリを読み取れません: {0}" @@ -27457,5 +27925,4 @@ #~ msgstr "メタデータの読み込みエラー" -#, java-format #~ msgid "requested: {0}" #~ msgstr "要求: {0}" @@ -27560,7 +28027,9 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." -#~ msgstr "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョンへと戻します。" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョン" +#~ "へと戻します。" #~ msgid "Tagging preset source" @@ -27600,5 +28069,4 @@ #~ msgstr "board" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "{0}でトラブルチケットを報告してください。" @@ -27607,13 +28075,10 @@ #~ msgstr "要素の履歴" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "ページ{0}を読み込む際にエラーが発生しました。" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "プリセット \"{0}\"を使います" @@ -27625,5 +28090,4 @@ #~ msgstr "基本" -#, java-format #~ msgid "rectifier id={0}" #~ msgstr "修正子 ID={0}" @@ -27660,7 +28124,8 @@ #~ "The plugin could not be removed. Please tell the people you got JOSM from " #~ "about the problem." -#~ msgstr "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してください。" - -#, java-format +#~ msgstr "" +#~ "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してくださ" +#~ "い。" + #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27677,7 +28142,9 @@ #~ 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 "Combine ways with different memberships?" @@ -27688,5 +28155,6 @@ #~ msgid "Please select one or more closed ways of at least four nodes." -#~ msgstr "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。" +#~ msgstr "" +#~ "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。" #~ msgid "Metacarta Map Rectifier image id" @@ -27698,14 +28166,17 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" -#~ "警告：パスワードは平文で設定ファイルに格納されます。
パスワードは、URLに付加されて平文でサーバに送信されます。
他で使用" -#~ "しているパスワードは使用しないでください。" +#~ "警告：パスワードは平文で設定ファイルに格納されます。
パスワード" +#~ "は、URLに付加されて平文でサーバに送信されます。
他で使用しているパス" +#~ "ワードは使用しないでください。" #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " #~ "move mouse. Select: Click." -#~ msgstr "ズーム:マウスのホイールか、ダブルクリック。地図の移動：右マウスボタンを押した状態で移動させる。選択：クリック。" +#~ msgstr "" +#~ "ズーム:マウスのホイールか、ダブルクリック。地図の移動：右マウスボタンを押" +#~ "した状態で移動させる。選択：クリック。" #~ msgid "Occupied By" @@ -27722,9 +28193,7 @@ #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." #~ msgstr "" -#~ "タグ付けのソース(URL " -#~ "やファイル名)が、定義ファイルに設定してあります。詳しくは、http://josm.openstreetmap.de/wiki/TaggingPreset" -#~ "s を見てください。" - -#, java-format +#~ "タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳し" +#~ "くは、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。" + #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27740,5 +28209,4 @@ #~ msgstr "競合点の統合" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "競合: {0}" @@ -27747,5 +28215,4 @@ #~ msgstr "下に移動" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "関連の編集者:{0}" @@ -27771,7 +28238,8 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" -#~ msgstr "選択したノードは、異なった関連に属しています。それでも、結合しますか？" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "選択したノードは、異なった関連に属しています。それでも、結合しますか？" #~ msgid "Merge nodes with different memberships?" @@ -27779,7 +28247,9 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." -#~ msgstr "内部エラー：レイヤーのないところで条件チェックはできません。バグとして報告してください。" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "内部エラー：レイヤーのないところで条件チェックはできません。バグとして報告" +#~ "してください。" #~ msgid "Combine Anyway" @@ -27792,11 +28262,15 @@ #~ "Please select at least one node, way or relation. Only already uploaded " #~ "elements have a history." -#~ msgstr "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップロードされた要素だけに遍歴があります。" +#~ msgstr "" +#~ "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップ" +#~ "ロードされた要素だけに遍歴があります。" #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" -#~ msgstr "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いているか、ダウンロードしましたか？" - -#, java-format +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いている" +#~ "か、ダウンロードしましたか？" + #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -27822,5 +28296,4 @@ #~ msgstr "とりあえず続ける" -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "最初に投影法を {0} に変えてください。" @@ -27830,7 +28303,9 @@ #~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You can " -#~ "adjust the sliders to manually match the photos." -#~ msgstr "GPXトラックに写真を合わせようとしているときにエラーが起きました。スライダーを調整して、手動で写真に合わせることができます。" +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." +#~ msgstr "" +#~ "GPXトラックに写真を合わせようとしているときにエラーが起きました。スライ" +#~ "ダーを調整して、手動で写真に合わせることができます。" #~ msgid "Map Type" @@ -27847,5 +28322,6 @@ #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード" +#~ msgstr "" +#~ "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード" #~ msgid "Really mark this issue as ''done''?" @@ -27858,9 +28334,7 @@ #~ msgstr "米Yahoo (GNOME Fix)" -#, java-format #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "パス {0} にあるイメージは存在しないか、読めません。" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27893,21 +28367,24 @@ #~ "(You can change the number of days after which this warning appears
by " #~ "setting the config option 'pluginmanager.warntime'.)" -#~ msgstr "（この警告が何日で表示されるかは
設定オプションの'pluginmanager.warntime'を編集することで変更できます）" - -#, java-format +#~ msgstr "" +#~ "（この警告が何日で表示されるかは
設定オプションの'pluginmanager." +#~ "warntime'を編集することで変更できます）" + #~ msgid "" #~ "WARNING: launching browser windows for the first {0} of {1} selected " #~ "primitives only" -#~ msgstr "警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初の{0}だけです。" +#~ msgstr "" +#~ "警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初" +#~ "の{0}だけです。" #~ msgid "Download referrers..." #~ msgstr "参照をダウンロード..." -#, java-format #~ msgid "" #~ "There are unsaved changes in {0} layer. Discard the changes and continue?" #~ msgid_plural "" #~ "There are unsaved changes in {0} layers. Discard the changes and continue?" -#~ msgstr[0] "{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?" +#~ msgstr[0] "" +#~ "{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?" #~ msgid "Close current changeset" @@ -27918,37 +28395,39 @@ #~ msgid "" -#~ "Select to upload the data using a new changeset and to leave the changeset " -#~ "open after the upload" -#~ msgstr "選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後に変更セットを閉じる" - -#, java-format +#~ "Select to upload the data using a new changeset and to leave the " +#~ "changeset open after the upload" +#~ msgstr "" +#~ "選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後" +#~ "に変更セットを閉じる" + #~ msgid "Use the existing changeset {0} and close it after upload" #~ msgstr "既存の変更セット {0} を使用しアップロード後に閉じる" -#, java-format #~ msgid "" #~ "Select to upload to the existing changeset {0} and to close the changeset " #~ "after this upload" -#~ msgstr "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セットを閉じる" - -#, java-format +#~ msgstr "" +#~ "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セッ" +#~ "トを閉じる" + #~ msgid "Use the existing changeset {0} and leave it open" #~ msgstr "既存の変更セット {0} を使用し開いたままにしておく" -#, java-format #~ msgid "" #~ "Select to upload to the existing changeset {0} and to leave the changeset " #~ "open for further uploads" -#~ msgstr "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするために変更セットを開いておく" - -#, java-format +#~ msgstr "" +#~ "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするた" +#~ "めに変更セットを開いておく" + #~ msgid "" #~ "Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -#~ "changeset will automatically be closed by the server after a timeout." +#~ "changeset will automatically be closed by the server after a timeout." #~ msgstr "" -#~ "OSM サーバ ''{1}'' 上の変更セット ''{0}'' " -#~ "を閉じられませんでした。
変更セットはタイムアウト後にサーバによって自動的に閉じられます。" - -#, java-format +#~ "OSM サーバ ''{1}'' 上の変更セット ''{0}'' を閉じられませんでした。" +#~ "
変更セットはタイムアウト後にサーバによって自動的に閉じられます。" + #~ msgid "Changeset {0} is unchanged. Skipping update." #~ msgstr "変更セット {0} は変更されていません。更新をスキップします。" @@ -27957,19 +28436,20 @@ #~ msgstr "現在変更セットは開かれていません。新しい変更セットを開いています..." -#, java-format #~ msgid "Reusing existing changeset {0}" #~ msgstr "既存の変更セット {0} を再利用しています" #~ msgid "" -#~ "Warning: could not reuse an existing changeset as requested. Opening a new " -#~ "one." -#~ msgstr "警告: 要求された既存の変更セットを再利用できません。新しく開いています。" +#~ "Warning: could not reuse an existing changeset as requested. Opening a " +#~ "new one." +#~ msgstr "" +#~ "警告: 要求された既存の変更セットを再利用できません。新しく開いています。" #~ msgid "" -#~ "Failed to update changeset. Either there is no current changeset or the id " -#~ "of the current changeset is 0" -#~ msgstr "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更セットのIDが 0 です。" - -#, java-format +#~ "Failed to update changeset. Either there is no current changeset or the " +#~ "id of the current changeset is 0" +#~ msgstr "" +#~ "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更" +#~ "セットのIDが 0 です。" + #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" #~ msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません" @@ -27987,18 +28467,18 @@ #~ msgstr "競合が検出されました" -#, java-format #~ msgid "" #~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " #~ "relation?" #~ msgstr "" -#~ "選択 \"{0}\" はリレーション \"{1}\" で使用されています。
リレーションから削除しますか？" +#~ "選択 \"{0}\" はリレーション \"{1}\" で使用されています。
リレー" +#~ "ションから削除しますか？" #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" -#~ msgstr "このデータセットには id {0} バージョン {1} のプリミティブはありません" +#~ msgstr "" +#~ "このデータセットには id {0} バージョン {1} のプリミティブはありません" #~ msgid "Primitive already deleted" #~ msgstr "プリミティブは削除済み" -#, java-format #~ msgid "" #~ "Uploading failed because a primitive you tried " @@ -28006,6 +28486,6 @@ #~ "is:
{0}" #~ msgstr "" -#~ "アップロード 失敗 " -#~ "サーバから削除しようとしたプリミティブは既に削除されています。

エラーメッセージ:
{0}" +#~ "アップロード 失敗 サーバから削除しようとしたプリミ" +#~ "ティブは既に削除されています。

エラーメッセージ:
{0}" #~ msgid "not yet decided" @@ -28039,36 +28519,31 @@ #~ msgstr "1 つのプリミティブを破棄" -#, java-format #~ msgid "" -#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " -#~ "from relation?" +#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." +#~ "
Delete from relation?" #~ msgstr "" -#~ "選択 \"{0}\" は、リレーション \"{1}\" のロール " -#~ "{2}で使用されています。
リレーションから削除しますか?" - -#, java-format +#~ "選択 \"{0}\" は、リレーション \"{1}\" のロール {2}で使用されていま" +#~ "す。
リレーションから削除しますか?" + #~ msgid "removing reference from way {0}" #~ msgstr "ウェイ {0}から、参照を取り除く" -#, java-format #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -#~ msgstr "リレーション {1} のメンバー {0} に予期しない \"type\"、 {2} を受け取りました。" +#~ msgstr "" +#~ "リレーション {1} のメンバー {0} に予期しない \"type\"、 {2} を受け取りまし" +#~ "た。" #~ msgid "Select a starting node on the end of a way" #~ msgstr "ウェイ終端の開始ノードを選択" -#, java-format #~ msgid "The XML source (URL or filename) for {0} definition files." #~ msgstr "{0} 定義ファイル用XML ソース(URL またはファイル名)。" -#, java-format #~ msgid "unsupported value ''{0}'' or parameter ''{1}''" #~ msgstr "サポートされていない値 ''{0}''またはパラメータ ''{1}''" -#, java-format #~ msgid "paramete''{0}'' must not be null" #~ msgstr "パラメータ''{0}'' はヌルでなければなりません" -#, java-format #~ msgid "Missing mandatory attribute ''{0}''" #~ msgstr "必要な属性 ''{0}'' がありません" @@ -28080,16 +28555,18 @@ #~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " #~ "found." -#~ msgstr "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が見つかりません。" - -#, java-format +#~ msgstr "" +#~ "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が" +#~ "見つかりません。" + #~ msgid "Help page missing. Create it in English." -#~ msgstr "ヘルプページがありません。英語で作成してください。" - -#, java-format +#~ msgstr "" +#~ "ヘルプページがありません。英語で作成してください。" + #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" -#~ "ヘルプページがありません。英語 または あなたの言語で作成してください。" +#~ "ヘルプページがありません。英語 または " +#~ "あなたの言語で作成してください。" #~ msgid "Didn't find an primitive with id {0} in this dataset" @@ -28097,14 +28574,15 @@ #~ msgid "Helppage missing. Create it in English." -#~ msgstr "ヘルプページがありません。英語でそれを作成してください。" +#~ msgstr "" +#~ "ヘルプページがありません。英語でそれを作成してくださ" +#~ "い。" #~ msgid "" -#~ "Helppage missing. Create it in English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" -#~ "ヘルプページがありません。英語もしくはあなたの母国語でそれを作成してください。" - -#, java-format +#~ "ヘルプページがありません。英語もしくは" +#~ "あなたの母国語でそれを作成してください。" + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。" @@ -28122,5 +28600,4 @@ #~ msgstr "最新のバージョンがありません。履歴は空です。" -#, java-format #~ msgid "Index out of bounds. Got {0}." #~ msgstr "範囲外のインデックス。{0} を受け取りました" @@ -28129,39 +28606,35 @@ #~ msgstr "選択されたプリミティブの履歴を表示" -#, java-format #~ msgid "" #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." #~ msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" -#, java-format #~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''." +#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " +#~ "''{1}''." #~ msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" -#, java-format #~ msgid "Preset group ''{0}'' of group ''{1}''" #~ msgstr "プリセットのグループ ''{1}'' のグループ ''{0}''" -#, java-format #~ msgid "" -#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back to " -#~ "default geometry. Details: {1}" +#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back " +#~ "to default geometry. Details: {1}" #~ msgstr "" -#~ "キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトのgeometry にフォールバックします。詳細: {1}" +#~ "キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトの" +#~ "geometry にフォールバックします。詳細: {1}" #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" #~ msgstr "ランベルトzone を手動設定 (例：２つのゾーン間の位置用)" -#, java-format #~ msgid "Processing {0}" #~ msgstr "{0} 実行中" -#, java-format #~ msgid "Relation: from {0} to {1} via {2}" #~ msgstr "リレーション: {0} から {1} まで {2} 経由" #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -28177,6 +28650,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example, replacing 73 with your image id:\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28185,5 +28658,6 @@ #~ "use." #~ msgstr "" -#~ "WMSplugin 設定タブのWMS エントリを追加、編集、削除できます - これはWMS メニューに表示されます。\n" +#~ "WMSplugin 設定タブのWMS エントリを追加、編集、削除できます - これはWMS メ" +#~ "ニューに表示されます。\n" #~ "\n" #~ "高度な設定によって、次のスキーマを使うことで手動でも行えますできます:\n" @@ -28196,14 +28670,14 @@ #~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" #~ "\n" -#~ "Metacarta's 地図用Rectifier http://labs.metacarta.com/rectifier/ , 関連する 'id' " -#~ "を入力するだけです。\n" -#~ "Metacarta 地図Rectifier メニューアイテムを追加するには、手動で下記例のようなURL を生成してください、73 " -#~ "のところはあなたの画像ID に置き換えます:\n" +#~ "Metacarta's 地図用Rectifier http://labs.metacarta.com/rectifier/ , 関連す" +#~ "る 'id' を入力するだけです。\n" +#~ "Metacarta 地図Rectifier メニューアイテムを追加するには、手動で下記例のよう" +#~ "なURL を生成してください、73 のところはあなたの画像ID に置き換えます:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" #~ "\n" -#~ "お知らせ: 画像はコピーライト表示に従い、疑わしいものは使用しないでください。" - -#, java-format +#~ "お知らせ: 画像はコピーライト表示に従い、疑わしいものは使用しないでくださ" +#~ "い。" + #~ msgid "{0} via nodes." #~ msgstr "{0} 経由ノード。" @@ -28212,16 +28686,14 @@ #~ msgstr "更新要求中にエラー: ズームレベル12 ではありません" -#, java-format #~ msgid "Via node {0}, {1}" #~ msgstr "経由ノード {0}, {1}" #~ msgid "Replace the way this member refers to with the combined way" -#~ msgstr "このメンバーが参照しているウェイを結合するウェイと置き換えてください。" - -#, java-format +#~ msgstr "" +#~ "このメンバーが参照しているウェイを結合するウェイと置き換えてください。" + #~ msgid "MIddle way: {0}" #~ msgstr "中間のウェイ: {0}" -#, java-format #~ msgid "{0} extrem nodes." #~ msgstr "{0} 極値ノード。" Index: /applications/editors/josm/i18n/po/nb.po =================================================================== --- /applications/editors/josm/i18n/po/nb.po (revision 18974) +++ /applications/editors/josm/i18n/po/nb.po (revision 18975) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 16:20+0100\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" "PO-Revision-Date: 2009-11-17 17:59+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:05+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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" @@ -116,5 +115,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 @@ -137,9 +136,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 @@ -155,20 +154,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 @@ -187,7 +182,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 "Feil" @@ -267,5 +262,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 "Programtillegg" @@ -306,4 +301,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 @@ -311,8 +308,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 @@ -322,29 +319,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 @@ -373,6 +368,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 "" @@ -424,14 +419,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 "Breddegrad" #: ../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 "Lengdegrad" @@ -457,10 +452,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 @@ -491,19 +486,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 @@ -512,9 +510,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 @@ -530,7 +525,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 @@ -542,11 +537,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" @@ -634,5 +629,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}" @@ -685,10 +680,10 @@ msgstr "Kan ikke sammenføye linjer. (Kan ikke bli sammenhengende nodestreng)" -#: ../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 "Sammenføy {0} linjer" -#: ../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 "Velg minst to linjer å sammenføye." @@ -707,19 +702,19 @@ msgstr "Velg noe å kopiere." +#: ../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 "Lag en sirkel" -#: ../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 "Lag en sirkel fra tre valgte noder." -#: ../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 "Disse nodene er ikke i en sirkel. Avbryter." -#: ../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 " @@ -732,9 +727,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 @@ -806,21 +801,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" @@ -828,6 +827,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 @@ -856,5 +855,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 "Fordoble" @@ -911,8 +910,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 @@ -920,5 +917,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 @@ -931,8 +928,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 @@ -951,8 +948,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 @@ -975,13 +972,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 @@ -1021,4 +1019,105 @@ msgstr "Vis objektinformasjon om OSMs noder, linjer eller relasjoner." +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "Slå sammen områder med overlapp" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Joins areas that overlap each other" +msgstr "Slår sammen områder med overlapp" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +msgid "Only up to two areas can be joined at the moment." +msgstr "Bare to områder kan bli slått sammen foreløpig." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#, java-format +msgid "\"{0}\" is not closed and therefore can't be joined." +msgstr "«{0}» er ikke lukket, og kan derfor ikke være med i sammenføyning." + +#: ../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 "" +"De valgte linjene har noder utenfor nedlastet dataområde.\n" +"Dette kan medføre at noder blir slettet ved uhell.\n" +"Er du sikker på at du vil fortsette?" + +#: ../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 "Angre hvis du er usikker" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 +msgid "Please select at least one closed way the should be joined." +msgstr "Velg minst én lukket linje å sammenføye med." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +msgid "No intersection found. Nothing was changed." +msgstr "Fant ingen skjæring. Ingen endringer ble gjort." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +msgid "Added node on all intersections" +msgstr "Noder er lagt til i alle skjæringspunkt" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgid "Delete Ways that are not part of an inner multipolygon" +msgstr "Slette indre linjer som ikke er del av multipolygon (relasjoner)" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +msgid "Fix relations" +msgstr "Reparer relasjoner" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgid "Joined self-overlapping area" +msgstr "Slo sammen områder som overlappet seg selv" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +msgid "Joined overlapping areas" +msgstr "Slo sammen overlappende områder" + +#: ../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 "" +"Noen linjer er medlem i relasjoner som er endret. Sjekk at ingen feil har " +"oppstått." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +msgid "Enter values for all conflicts." +msgstr "Legg inn verdier for alle konflikter." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Løs konflikter" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +msgid "Fix tag conflicts" +msgstr "Reparer konflikter i egenskaper." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +msgid "Removed Element from Relations" +msgstr "Fjernede Element fra Relasjoner" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +msgid "Join Areas: Remove Short Ways" +msgstr "Slå sammen arealer: fjern korte linjer" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +msgid "Closed Way" +msgstr "Lukket linje" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgid "Remove tags from inner ways" +msgstr "Fjern egenskaper fra indre linjer" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +msgid "Join Areas Function" +msgstr "Funksjon Slå sammen Areal" + #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 @@ -1038,4 +1137,45 @@ msgstr "Ingen hurtigtast" +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Jump To Position" +msgstr "Gå til Posisjon" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Opens a dialog that allows to jump to a specific location" +msgstr "Åpner dialog som lar deg gå til bestemt posisjon" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57 +msgid "Enter Lat/Lon to jump to position." +msgstr "Gi inn Lat/Lon for posisjon du vil gå til" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 +msgid "You can also paste an URL from www.openstreetmap.org" +msgstr "Du kan også lime inn URL fra www.openstreetmap.org" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 +msgid "Zoom (in metres)" +msgstr "Zoom (i meter)" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 +msgid "URL" +msgstr "URL" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 +msgid "Jump there" +msgstr "Gå dit" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 +msgid "Jump to Position" +msgstr "Gå til posisjon" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Could not parse Latitude, Longitude or Zoom. Please check." +msgstr "Kunne ikke tolke Lat / Lon eller zoom. Sjekk input." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Unable to parse Lon/Lat" +msgstr "Kunne ikke tolke Lat / Lon" + #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" @@ -1046,26 +1186,26 @@ msgstr "Flett det gjeldende laget inn i et annet lag" +#: ../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 "Samle noder" -#: ../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 "Samle noder i den eldste" -#: ../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 "Velg minst to noder til å samle" -#: ../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 "" @@ -1073,5 +1213,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" @@ -1445,6 +1585,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 "Vis statusrapport med informasjon for feilsøking" @@ -1464,9 +1603,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 "Lukk" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Forenkle linje" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Slett overflødige noder fra en linje." + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "Velg minst én linje å forenkle." + +#: ../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] "Utvalget har {0} linje. Er du sikker på at du vil forenkle denne?" +msgstr[1] "Utvalget har {0} linjer. Er du sikker på at du vil forenkle disse?" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 +msgid "Are you sure?" +msgstr "Er du sikker?" + +#: ../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] "Forenkle linje (fjern {0} node)" +msgstr[1] "Forenkle linjer (fjern {0} noder)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1591,6 +1762,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 "– En node som er brukt av flere linjer, og en av linjene, eller" @@ -1670,54 +1840,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 "Oppdater utvalg" +#: ../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 "Utvalget er tomt" -#: ../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 "Last opp data" -#: ../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 "" @@ -1726,35 +1896,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 "Ingen endringer å laste opp." -#: ../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 "Ingen endringer å laste opp. Finn frem data først." -#: ../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 "Synkroniser hele datasettet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1762,9 +1932,8 @@ "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.
" +"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 "" "Upplasting feilet fordi tjeneren har en nyere versjon " @@ -1773,29 +1942,27 @@ "{2}, lokal versjon er {3}.

Trykk {4} for å " "synkronisere kun konfliktelementet.
Trykk {5} for å " -"synkronisere hele det lokale datasettet med tjeneren.
Trykk " -"{6} for å gå tilbake og fortsette å redigere.
" - -#: ../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 +"synkronisere hele det lokale datasettet med tjeneren.
Trykk {6} for å gå tilbake og fortsette å redigere.
" + +#: ../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 "Konflikter avdekkeet" -#: ../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.
" +"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 "" "Opplasting feilet fordi tjeneren har en nyere versjon " "av en node, linje ellerrelasjon.

Trykk {0} for å " -"synkronisere hele det lokale datasettet med tjeneren.
Trykk " -"{1} for å avbryte operasjonen og fortsette å " -"redigere.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 +"synkronisere hele det lokale datasettet med tjeneren.
Trykk {1} for å avbryte operasjonen og fortsette å redigere.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1805,22 +1972,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 "Forbereder konfliktløsing" -#: ../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 "" @@ -1831,15 +1998,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 "Oppdaterer objekt" @@ -1851,6 +2018,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 "" @@ -1859,38 +2026,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 "" @@ -2054,12 +2220,12 @@ "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 "" "Det er {0} elementer i det lokale datasettet som
kan være slettet " "på tjeneren. Hvis du senere prøver å slette
eller oppdatere dem, vil " -"tjeneren sannsynligvis rapportere om en
konflikt.

Trykk " -"{1} for å sjekke status for disse elementene
på " -"tjeneren.
Trykk {2} for å ignorere.
" +"tjeneren sannsynligvis rapportere om en
konflikt.

Trykk {1}" +" for å sjekke status for disse elementene
på tjeneren.
Trykk " +"{2} for å ignorere.
" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183 @@ -2127,38 +2293,38 @@ msgstr "valgt" -#: ../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 "Kan ikke legge til node utenfor kartet." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Legg til node" -#: ../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 "Legg til node i linje" -#: ../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 "Knytt eksisterende linje til node" -#: ../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 "Legg til en node i eksisterende linje" -#: ../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 "Legg til node i linje og lag tilknytning" -#: ../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 "Lag ny node." -#: ../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 "Veg node under pekeren." -#: ../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." @@ -2167,14 +2333,14 @@ msgstr[1] "Sett inn ny node i {0} linjer." -#: ../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 "Start ny linje fra siste node." -#: ../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 "Fortsett samme linje fra siste node." -#: ../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 "Avslutt tegning." @@ -2209,9 +2375,9 @@ #: ../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." -msgstr "" -"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; " -"Shift+slipp synkroniserer audio i dette punktet." +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; Shift" +"+slipp synkroniserer audio i dette punktet." #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 @@ -2312,5 +2478,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." @@ -2388,6 +2554,5 @@ msgid "" "type: - type of the object (node, way, relation)" -msgstr "" -"type: – type objekt (node, way, relation)" +msgstr "type: – type objekt (node, way, relation)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 @@ -2396,12 +2561,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:… – alle objekter redigert av angitt bruker" + +#: ../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 "nodes:… – objekt med angitt antall noder" -#: ../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-" @@ -2409,21 +2579,21 @@ 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 "modified – alle endrede objekter" -#: ../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 "selected – alle objekter i utvalg" -#: ../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 "incomplete – alle uferdige objekter" -#: ../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 "untagged – alle objekter uten egenskaper" -#: ../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" @@ -2431,5 +2601,5 @@ "child uttrykk – alle underobjekter av objektene i uttrykket" -#: ../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" @@ -2437,9 +2607,9 @@ "parent uttrykk – alle overobjekter av objektene i uttrykket" -#: ../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 "Bruk | eller OR for søk med logisk eller" -#: ../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 "" @@ -2447,9 +2617,9 @@ "«:»)" -#: ../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 "Bruk ( og ) for å gruppere uttrykk" -#: ../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 @@ -2459,55 +2629,55 @@ msgstr "Filter" -#: ../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 "Søk" -#: ../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 "Start søk" -#: ../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 "Fant ingen treff for «{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 "Ingenting lagt til utvalg ved søk etter «{0}»" -#: ../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 "Ingenting fjernet fra utvalg ved søk etter «{0}»" -#: ../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 "Fant {0} treff" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2520,41 +2690,41 @@ "{2}" -#: ../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 "" "Nøkkel kan ikke være tom når egenskap-operatoren brukes. Bruk: nøkkel=verdi" -#: ../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 "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation" -#: ../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 "Uventet symbol: {0}" -#: ../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 "OR mangler argument." -#: ../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 "NOT mangler argument." -#: ../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 "Forventer parentes slutt." -#: ../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 "" @@ -2563,9 +2733,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 "Feil antall parametere for nodes-operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 #, java-format msgid "" @@ -2576,5 +2746,5 @@ "intervall, for eksempel nodes:10-20" -#: ../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." @@ -2625,15 +2795,14 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" +#, fuzzy, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" msgstr "" "Advarsel: forkorter automatisk verdi for egenskap «{0}» i slettet objekt {1}" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2648,6 +2817,5 @@ #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" -"{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}" +msgstr "{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2772,5 +2940,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 "" @@ -2789,5 +2957,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 "" @@ -2806,19 +2975,19 @@ msgstr "kan ikke løse uavgjort konflikt" +#: ../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" @@ -2827,5 +2996,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" @@ -2834,5 +3003,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" @@ -2841,5 +3010,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" @@ -2850,16 +3019,16 @@ #. 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?" +#: ../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 "" "Du er i ferd med å slette noder utenfor nedlastet område.
Dette kan skape " -"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se nå) " -".
Er du sikker på at du vil slette nodene?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se " +"nå) .
Er du sikker på at du vil slette nodene?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "" @@ -2877,15 +3046,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 "" @@ -2896,5 +3065,5 @@ "er {1}." -#: ../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}" @@ -2905,11 +3074,4 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Løs medlemskonflikter i relasjon {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "" -"Kan ikke gjøre om kommando \"{0}\" fordi lag \"{1}\" ikke lenger er " -"tilgjengelig" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -2988,5 +3150,5 @@ msgstr "Gjennomføre?" -#: ../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 " @@ -3131,6 +3293,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 "" @@ -3213,5 +3375,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3220,5 +3382,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3226,25 +3388,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 "S" #. 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 "N" #. 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 "V" #. 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 @@ -3267,25 +3429,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}" @@ -3293,6 +3456,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 "" @@ -3355,24 +3518,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 " @@ -3380,5 +3543,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 "" @@ -3410,6 +3573,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}." @@ -3430,5 +3593,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 @@ -3440,6 +3602,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 "" @@ -3450,135 +3611,135 @@ msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}" -#: ../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 "Linje for areal er ikke lukket." -#: ../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 "multipolygon-linje «{0}» er ikke lukket." -#: ../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 "Slettet medlem «{0}» i relasjon." -#: ../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 "Linje «{0}» med færre enn to punkter." -#: ../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 "Fant mer enn én linje med «from»." -#: ../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 "Fant mer enn én linje med «to»." -#: ../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 "Fant mer enn én \"via\"." -#: ../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 "Ukjent rolle «{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 "Ukjent medlemstype for «{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 "Fant ingen linje med «from»." -#: ../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 "Fant ingen linje med «to»." -#: ../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 "Fant ingen node eller linje med «via»." -#: ../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 "Linje med «from» har ikke start eller slutt i en «via»-node." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../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 "Linje med \"to\" har ikke start eller slutt i \"via\"-node." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Linje med «from» har ikke start eller slutt i en «via»-linje." -#: ../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 "linje med «to» har ikke start eller slutt i en «via»-linje." -#: ../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 "Fant ikke stil for restriksjon {0}." -#: ../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 "Skjæring mellom linjene «{0}» og «{1}»." -#: ../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 "Indre linje «{0}» er utenfor." -#: ../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 "Ingen fornuftig rolle «{0}» for linje «{1}»." -#: ../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 "Multipolygon-medlem «{0}» er ikke en linje." -#: ../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 "Ingen ytre linje for multipolygon «{0}»." -#: ../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 "Stil for indre linje «{0}» er samme som multipolygon." -#: ../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 "Stil for ytre linje «{0}» passer ikke." -#: ../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 "Uten egenskaper" -#: ../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 "tekst" -#: ../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 "Feil: {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}" @@ -3590,5 +3751,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 @@ -3607,5 +3768,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 @@ -3625,5 +3786,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 "bakgrunn" @@ -3741,6 +3902,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 "" @@ -3755,5 +3915,5 @@ msgstr "Ikke vis igjen" -#: ../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 @@ -3761,32 +3921,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 "uferdig" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "ferdselsvei" -#: ../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 "jernbane" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "vannvei" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "bruk av grunn" -#: ../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" @@ -3795,5 +3955,5 @@ msgstr[1] "{0} noder" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -3888,6 +4048,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "" -"Endre vinduets størrelse til oppgitt geometri (format: BREDDExHØYDE)" +msgstr "Endre vinduets størrelse til oppgitt geometri (format: BREDDExHØYDE)" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 @@ -3927,6 +4086,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "If specified, reset the configuration instead of reading it." -msgstr "" -"Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn." +msgstr "Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn." #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 @@ -4044,12 +4202,12 @@ msgstr "Innstilligen {0} er fjernet fordi den ikke lenger brukes." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Fil" -#: ../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 @@ -4063,19 +4221,19 @@ msgstr "Endre" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Vis" -#: ../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 "Verktøy" -#: ../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 "Objektmaler" -#: ../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 @@ -4086,5 +4244,5 @@ msgstr "Meny: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Audio" @@ -4128,29 +4286,29 @@ msgstr "målestokk" -#: ../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 "Lengdegrad ved musepekeren." -#: ../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 "Navn på objekt ved musepeker" -#: ../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 "Breddegrad ved musepekeren." -#: ../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 "Vinkel mellom forrige og nåværende linjesegment." -#: ../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 "Kompassretning på segmentet som tegnes." -#: ../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 "Lengden på segmentet som tegnes." -#: ../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 " @@ -4158,9 +4316,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(intet objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "" @@ -4267,5 +4425,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" @@ -4274,5 +4432,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" @@ -4281,5 +4439,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" @@ -4298,5 +4456,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 @@ -4313,5 +4471,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" @@ -4387,22 +4545,22 @@ msgstr "Konfliktløsning" -#: ../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 "parameter «current» utenfor rekkevidde: leste {0}" -#: ../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 "Liste i rolle {0} er for øyeblikket ikke med i et sammenlikningspar." -#: ../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 "Uventet verdi for parameter «index». Leste {0}." -#: ../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." @@ -4493,6 +4651,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 "" "Kopier valgte elementer på tjeneren til slutten av lista over sammenslåtte " @@ -4567,6 +4724,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" "Trykk {0} for å begynne sammenslåingen av lokal- og " @@ -4576,6 +4733,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" "Trykk {0} for å avslutte sammenslåingen av lokal- og " @@ -4623,6 +4780,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." -msgstr "" -"Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando." +msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando." #. should not happen @@ -4635,9 +4791,9 @@ #, java-format msgid "" -"An error occurred while communicating with the server
Details: " -"{0}" -msgstr "" -"Det oppstod en feil under kommunikasjon med tjeneren.
Detaljer: " -"{0}" +"An error occurred while communicating with the server
Details: {0}" +msgstr "" +"Det oppstod en feil under kommunikasjon med tjeneren.
Detaljer: {0}" +"" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 @@ -4661,6 +4817,6 @@ "the server.

Do you want to undelete these nodes too?" msgstr "" -"Ytterligere {0} noder i bruk av linje {1},
er slettet på " -"tjeneren.

Vil du gjenopprette også disse nodene?" +"Ytterligere {0} noder i bruk av linje {1},
er slettet på tjeneren." +"

Vil du gjenopprette også disse nodene?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 @@ -4671,7 +4827,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 "" "Ytterligere {0} objekter med henvisninger i relasjon {1},
er " @@ -4823,8 +4979,7 @@ msgstr "Objekt" -#: ../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 "" -"Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando." +msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 @@ -4957,5 +5112,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 "" @@ -5055,7 +5210,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" @@ -5065,6 +5220,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" @@ -5098,7 +5253,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 "" @@ -5187,5 +5340,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 @@ -5250,10 +5403,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 "" @@ -5328,18 +5480,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 "Historikk" -#: ../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 "Vis historikk på alle valgte objekt." -#: ../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 @@ -5349,13 +5501,13 @@ msgstr "Last inn på nytt" -#: ../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 "Les inn og oppfrisk liste over alle valgte objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303 msgid "Show" msgstr "Vis" -#: ../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 "" @@ -5548,5 +5700,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 "" @@ -5589,30 +5741,30 @@ msgstr "Zoom til utvalg" -#: ../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 "Valgt: Rel.:{0} / Linjer:{1} / Noder:{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 "Utvalg" -#: ../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 "Utvalg: {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 "Frigjør panelet" -#: ../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 "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe." -#: ../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 "Klikk for at minimere/maksimere panelet" @@ -5672,37 +5824,37 @@ msgstr "# objekter" -#: ../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 "Last ned medlemer av relasjon" -#: ../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 "Konflikter i data" -#: ../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 "" @@ -5711,63 +5863,91 @@ 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 "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}" +#: ../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] "Last ned alle ufullstendige linjer og noder i relasjonen" +msgstr[1] "Last ned alle ufullstendige linjer og noder i relasjonen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Last ned medlemer av relasjon" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "Laster ned programtillegg {0} …" + +#: ../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 "Bruk løsninger" + +#: ../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 "Åpne en editor for den valgte relasjon" + +#: ../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 "" @@ -5777,15 +5957,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 " @@ -5793,5 +5973,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 " @@ -5799,20 +5979,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 "" @@ -5821,66 +6001,69 @@ 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 +msgid "Sort" +msgstr "Sorter" + +#: ../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 "Flytt valgte medlem opp" #. 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 "Flytt valgt medlem ned" #. 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 " @@ -5889,53 +6072,60 @@ 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" -msgstr "Last ned alle ufullstendige linjer og noder i relasjonen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#, fuzzy +msgid "Download all incomplete members" +msgstr "Last ned medlemer av relasjon" + +#: ../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 "Last ned medlemmer" -#: ../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 +#, fuzzy +msgid "Download selected incomplete members" +msgstr "Last ned medlemer av relasjon" + +#: ../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 "" @@ -5945,41 +6135,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 "" @@ -6019,19 +6202,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 "Utfør endringer" -#: ../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 "Skap ny relasjon i lag \"{0}\"" -#: ../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 "Rediger ny relasjon i lag \"{0}\"" -#: ../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}''" @@ -6043,6 +6226,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 "" @@ -6223,7 +6405,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 "" @@ -6996,5 +7177,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 @@ -7231,6 +7412,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 "" @@ -7240,6 +7421,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 "" @@ -7349,6 +7530,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273 msgid "History not initialized yet. Failed to set reference primitive." -msgstr "" -"Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement." +msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275 @@ -7369,6 +7549,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 msgid "History not initialized yet. Failed to set current primitive." -msgstr "" -"Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element." +msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 @@ -7508,13 +7687,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}" @@ -7615,6 +7794,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 "" @@ -7699,6 +7877,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] "" @@ -7712,6 +7890,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 " @@ -7766,5 +7944,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 " @@ -7772,5 +7950,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 "" @@ -7843,40 +8021,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 "Objekter som legges til:" -#: ../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 "Objekter som endres:" -#: ../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 "Objekter som slettes:" -#: ../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:" @@ -7885,5 +8063,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:" @@ -7892,5 +8070,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:" @@ -7899,68 +8077,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 "Last opp endringer" -#: ../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 "Tast inn først de ønskede koordinater." + +#: ../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 "Gi en kort kommentar for endringene du laster opp:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../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}" @@ -7968,16 +8145,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}." @@ -7985,6 +8162,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 "" @@ -7993,5 +8170,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 "" @@ -8021,111 +8198,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Bilder for {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "Les GPX …" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Ingen tid gitt for punkt {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 "Klarte ikke lese tid «{0}» for punkt {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 "Leser {0} …" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Ingen bilder med lesbare tidsstempler funnet" - -#: ../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 "Geotaggede bilder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "GPS start: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "GPS-slutt: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "nåværende forskjell: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "tidssone-forskjell: " - -#: ../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] "bilde" -msgstr[1] "bilder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} innenfor sporet." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Synkronisér klokke" - -#: ../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 "JPEG-bilder (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "Klarte ikke tolke datoen i fila «{0}»." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Bilde" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "GPS-enhetens tidssone (forskjell fra foto)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Synkronisér tidspunkt med GPS-enhet" - -#: ../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 "Den indtastede tid kunne ikke tolkes" - -#: ../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} meter" +msgstr[1] "{0} meter" + +#: ../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 "Oppgi brukernavn" + +#: ../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 @@ -8133,30 +8254,30 @@ msgstr "gps-punkt" -#: ../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 "Tilpass linjetegning" -#: ../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 "Bruk globale indstillinger." -#: ../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 "Tegn linjer mellem punkter i dette laget." -#: ../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 "Tegn ikke linjer mellem punkt i dette laget." -#: ../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 "Velg linjetegnings-innstillinger" -#: ../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 @@ -8164,5 +8285,5 @@ msgstr "Tilpass farge" -#: ../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 @@ -8171,5 +8292,5 @@ msgstr "Standard" -#: ../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 @@ -8178,58 +8299,63 @@ msgstr "Velg en farge" -#: ../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 "Markører fra navngitte punkt" -#: ../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 "Navngivne sporpunkt fra {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215 msgid "Import Audio" msgstr "Importer lyd" -#: ../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 "Wave-lydfiler (*.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 "Lyd-markører fra {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 "Importer bilder" -#: ../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 "JPEG-bilder (*.jpg)" + +#: ../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 "Navn: {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 @@ -8237,5 +8363,5 @@ msgstr "Beskrivelse: {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" @@ -8245,5 +8371,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 @@ -8251,22 +8377,17 @@ msgstr "Beskrivelse" -#: ../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 "URL" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443 msgid "Length: " msgstr "Lengde: " -#: ../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, " @@ -8275,5 +8396,5 @@ msgstr[1] "{0} ruter, " -#: ../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" @@ -8282,24 +8403,24 @@ msgstr[1] "{0} waypoints" -#: ../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 "Konverter til datalag" -#: ../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:" +#: ../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 "" "Opplasting av ubehandlede GPS-data som kortdata betraktes som " "skadeligt
Se her for å laste inn GPS spor:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8309,29 +8430,29 @@ msgstr "Konvertert fra: {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 "Last ned fra OSM langs dette spor" -#: ../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 "Last ned alt innenfor:" -#: ../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} meter" -#: ../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 "Max areal per forespørsel:" -#: ../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} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8342,9 +8463,9 @@ "Ønsker du
å fortsette?" -#: ../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 "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd." -#: ../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 " @@ -8354,5 +8475,5 @@ "ble utelatt eller flyttet til start." -#: ../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 " @@ -8362,23 +8483,23 @@ "utelatt." -#: ../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 "Datalag {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 "utenfor nedlastet område" -#: ../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 "versjon {0}" -#: ../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 "Advarsel: blandede 0.6- og 0.5-data resulterer i versjon 0.5" -#: ../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." @@ -8387,5 +8508,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 "" @@ -8399,5 +8520,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 "" @@ -8410,11 +8531,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" @@ -8423,32 +8544,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} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 msgid "unset" msgstr "ikke satt" -#: ../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 "API versjon: {0}" -#: ../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 "Konvertér til GPX-lag" -#: ../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 "" @@ -8456,6 +8577,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 "" @@ -8494,4 +8615,358 @@ msgstr[1] "{0} punkt" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "GPX Filer (*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "Fila {0} er lastet inn under navnet «{1}»" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#, java-format +msgid "Error while parsing {0}" +msgstr "Feil oppsto ved sending av {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Klarte ikke lese «{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 "" +"Ta et bilde av din GPS mottaker når den viser tid.
Vis bildet her." +"
Skriv inn tidspunktet og velg tidssone
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Tidspunkt for foto (fra EXIF):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "Gps tidspunkt (lest i bildet ovenfor): " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [dd/mm/yyyy hh:mm:ss]" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +msgid "I'm in the timezone of: " +msgstr "Jeg er i tidssonen: " + +#: ../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 "Ingen dato" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "Åpne et annet foto" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +msgid "Synchronize time from a photo of the GPS receiver" +msgstr "Synkroniser tiden fra et bilde på GPS-mottakeren" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"Feil ved tolking av dato.\n" +"Sjekk format" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "Ugyldig dato" + +#: ../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 "GPX-spor: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Åpne flere GPX-spor" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +msgid "Timezone: " +msgstr "Tidssone: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +msgid "Offset:" +msgstr "Forskyvning:" + +#: ../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 "" +"Jeg kan fotogragere min GPS mottaker.
Kan det være til hjelp?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 +msgid "Update position for: " +msgstr "Opdater posisjon for: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 +msgid "All images" +msgstr "Alle bilder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 +msgid "Images with no exif position" +msgstr "Bilder uden EXIF-posisjon" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 +msgid "Not yet tagged images" +msgstr "Bilder uten egenskaper" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +msgid "Correlate images with GPX track" +msgstr "Jevnfør bilder med GPX spor" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Correlate" +msgstr "Jevnfør" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Auto-Guess" +msgstr "Automatisk forslag" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +msgid "You should select a GPX track" +msgstr "Du bør velge et GPX-spor" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "Intgen GPX-spor er valgt" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Feil ved tolking av tidssone.\n" +"Forventet format: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +msgid "Invalid timezone" +msgstr "Ugyldig tidssone" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Feil ved tolking av forskyvning.\n" +"Forventet format: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +msgid "Invalid offset" +msgstr "Ugyldig forskyvning" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "Fant {0} treff av {1} i GPX spor {2}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "GPX-spor er lagt inn" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 +msgid "The selected photos don't contain time information." +msgstr "Valgte foto har ikke tidskode." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 +msgid "Photos don't contain time information" +msgstr "Foto har ikke tidskode." + +#: ../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 "Valgte GPX spor mangler tidskode. Velg et annet spor." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "GPX sporet har ikke tidskoder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "Tidssone: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "Minutter: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "Sekunder: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Koplet {0} av {1} foto til GPX spor." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "(Tidsforskjell på {0} dager)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "Forskyvning mellom spor og foto: {0}m {1}s" + +#: ../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 "" +"Klarte ikke synkronisere bildene med GPX-sporet. Bruk glidebryterne for å " +"synkronisere bildene manuelt." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 +msgid "Matching photos to track failed" +msgstr "Klarte ikke å koble foto til sporet" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +msgid "Adjust timezone and offset" +msgstr "Juster tidssone og forskyvning" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +msgid "Default Values" +msgstr "Standardverdier" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +msgid "Extracting GPS locations from EXIF" +msgstr "Leser GPS posisjoner fra EXIF" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +msgid "Starting directory scan" +msgstr "Starter scanning av mapper" + +#: ../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 "Les bilder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "Leser {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 "Klarte ikke å lage fullstendig sti til mappa {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "Scanner mappa {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "Fant tom fil i mappa {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Feil ved lesing av fil i mappa {0}\n" + +#: ../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 "Geotaggede bilder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "Juster til GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "bilde" +msgstr[1] "bilder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "{0} hadde gps posisjon." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +msgid "No image" +msgstr "Ingen bilder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "Laster {0}" + +#: ../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 "Feil i fil {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Vis geotaggede bilder" + +#: ../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 "Forrige" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Fjern foto fra lag" + +#: ../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 "Neste" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "Midtstill kartbilde" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +msgid "Zoom best fit and 1:1" +msgstr "Zoom beste utsnitt 1:1" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#, java-format +msgid "" +"\n" +"Altitude: {0} m" +msgstr "" +"\n" +"Høyde: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/t" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8807,5 +9282,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 @@ -9001,6 +9476,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 "" "Tegn retningspiler ved hjelp av tabellopslag i stedet for kompleks matematik." @@ -9011,6 +9485,5 @@ "Don't draw arrows if they are not at least this distance away from the last " "one." -msgstr "" -"Tegn ikke piler uten at det er minst denne avstand fra forrige punkt." +msgstr "Tegn ikke piler uten at det er minst denne avstand fra forrige punkt." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144 @@ -9065,6 +9538,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 "Bruk udjevning på kartvisningen for et mere glatt utseende." @@ -9132,19 +9604,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 "Utseende og opplevelse" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Språk" + +#: ../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 "Standard (automatisk valgt)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Språk" - -#: ../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 @@ -9405,6 +9877,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 "" @@ -9469,6 +9941,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 "" "

Dessuten: Første gang en menyknapp kobles til menyen blir hurtigtasten " @@ -9485,9 +9957,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 "" "

Du vil finne ut at lista med hutigtaster inneholder taster fra alle " @@ -9525,6 +9996,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 "

Pseudo-kombinasjonstasten 'disabled' vil ta ut snarveien.

" @@ -9617,5 +10088,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 "Mer informasjon om denne funksjonen" @@ -9702,5 +10173,5 @@ msgstr "Laster ned punkt {0} til {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 @@ -9708,5 +10179,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9828,15 +10299,14 @@ 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." +#: ../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 "" "Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../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 @@ -9864,20 +10334,20 @@ msgstr "Tjeneren svarte med HTTP 404 for ID {0} – hopper over." -#: ../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 " @@ -9886,4 +10356,11 @@ "Tjeneren svarte med HTTP 404, prøver igjen med en forespørsel for hvert " "element." + +#: ../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] "Laster ned punkt {0} til {1}..." +msgstr[1] "Laster ned punkt {0} til {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9925,28 +10402,28 @@ msgstr "Innstilling «{0}» mangler. Kan ikke starte OSM-API." -#: ../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 "Denne versjonen av JOSM kan ikke lese fra tjeneren." -#: ../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}." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#, fuzzy, java-format +msgid "" +"It supports protocol version 0.6, while the server says it supports {0} to " +"{1}." msgstr "" "Den støtter protokollversjon 0.5 og 0.6, mens tjeneren støtter {0} til {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Kommunikasjon er opprettet med {0} med protocol versjon {1}" -#: ../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 "Uventet ID-format i svar fra tjener – leste «{0}»" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 #, java-format msgid "" @@ -9954,66 +10431,66 @@ msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»" -#: ../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 "Lukker endringssett …" -#: ../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 "Ingen base med rettinger tilstede for opplasting" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "Preparing..." msgstr "Forbereder …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Laster opp …" -#: ../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}." @@ -10048,5 +10525,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}''." @@ -10073,5 +10550,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}." @@ -10079,5 +10556,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}" @@ -10090,5 +10567,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}''." @@ -10148,11 +10625,11 @@ #: ../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." -msgstr "" -"Advarsel: Passordet lagres i ren tekst i " -"innstillingsfila.
Passordet overføres i ren tekst til tjeneren som del av " -"URL-adressen.
Ikke bruk et verdifullt passord." +"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 "" +"Advarsel: Passordet lagres i ren tekst i innstillingsfila." +"
Passordet overføres i ren tekst til tjeneren som del av URL-adressen." +"
Ikke bruk et verdifullt passord." #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 @@ -10179,6 +10656,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 "" @@ -10222,6 +10699,5 @@ "Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''." msgstr "" -"ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste " -"«{1}»" +"ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste «{1}»" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:146 @@ -10251,46 +10727,45 @@ msgstr "Fila «{0}» finnes ikke" -#: ../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 "" @@ -10298,19 +10773,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 "Ufullstendig -spesifikasjon med ref=0" -#: ../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 "Ulovlig objekt med 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 "" @@ -10320,8 +10795,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 "" @@ -10331,25 +10806,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 "" @@ -10357,5 +10832,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10364,5 +10839,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10370,5 +10845,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10377,13 +10852,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 "Klargjør OSM-data …" -#: ../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 "" @@ -10436,4 +10911,10 @@ msgid "Contacting Server..." msgstr "Kobler til tjener …" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 +#, fuzzy, java-format +msgid "Expected value > 0 for parameter ''{0}'', got {1}" +msgstr "Uventet verdi for parameter «index». Leste {0}." #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10472,42 +10953,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 +#, fuzzy, java-format +msgid "Value >0 expected for parameter ''{0}'', got {1}" +msgstr "Uventet verdi for parameter «index». Leste {0}." + +#: ../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 "" @@ -10549,17 +11031,27 @@ msgstr "Laster ned programtillegg {0} …" -#: ../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 "Slett {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Feil ved sletting av programtillegg: {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 msgid "Skip download" msgstr "Hopp over nedlasting" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Download Plugin" msgstr "Last ned programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Skip Download" msgstr "Hopp over nedlasting" -#: ../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}." @@ -10571,19 +11063,18 @@ msgstr "Det oppsto feil i programtillegget {0}" -#: ../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" @@ -10592,24 +11083,24 @@ 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 "Siste oppdaterte programtillegg for {0} dager siden." -#: ../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 "Programtillegg {0} krever JOSM-oppdatering til versjon {1}." -#: ../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." @@ -10617,26 +11108,26 @@ "Programtillegget {1} er avhengig av programtillegg {0} men ble ikke funnet." -#: ../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 "Fant ikke programtillegget: {0}." -#: ../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 "Kan ikke laste inn programtillegg {0}. slettes fra innstillinger?" -#: ../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 "Fjern programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Keep plugin" msgstr "Behold programtillegg" -#: ../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 " @@ -10646,21 +11137,20 @@ "skrive over eksisterende." -#: ../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 "" "An unexpected exception occurred that may have come from the ''{0}'' plugin." -msgstr "" -"Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318 +msgstr "Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:319 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "I følge nformasjon i tilleggsprogram, er {0} opphavsmann." -#: ../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." @@ -10668,9 +11158,9 @@ "Prøv å oppdatere til ny versjon av programtillegg før du sender feilmelding." -#: ../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 "Skal programtillegget fjernes?" -#: ../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 " @@ -10680,13 +11170,13 @@ "lese programtillegg." -#: ../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" @@ -10805,6 +11295,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 "" @@ -10842,6 +11332,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 "" "Opplasting til tjeneren feilet fordi nåværende " @@ -10905,7 +11395,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 "" @@ -10917,7 +11406,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 "" @@ -10949,6 +11438,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 "" @@ -11208,5 +11697,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" @@ -11221,12 +11710,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 "Oddetall" -#: ../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 @@ -11234,456 +11721,144 @@ msgstr "Heltall" -#: ../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 "Nummer" + +#. 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 "natur" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "bilde" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Bilutleie" + +#: ../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 "indre linjesegment" + +#: ../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 "AgPifoJ – Geotaggede bilder" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "Vis geotaggede bilder" - -#: ../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 "Forrige" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Fjern foto fra lag" - -#: ../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 "Neste" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "Midtstill kartbilde" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102 -msgid "Zoom best fit and 1:1" -msgstr "Zoom beste utsnitt 1:1" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 -#, java-format -msgid "" -"\n" -"Altitude: {0} m" -msgstr "" -"\n" -"Høyde: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/t" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "Leser GPS posisjoner fra EXIF" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121 -msgid "Starting directory scan" -msgstr "Starter scanning av mapper" - -#: ../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 "Les bilder" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:186 -#, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "Klarte ikke å lage fullstendig sti til mappa {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "Scanner mappa {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "Fant tom fil i mappa {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Feil ved lesing av fil i mappa {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "Juster til GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} hadde gps posisjon." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "Åpne bilder med AgPifoJ …" - -#: ../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 "Last inn bildesett som et nyt lag." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "GPX Filer (*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "Fila {0} er lastet inn under navnet «{1}»" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#, java-format -msgid "Error while parsing {0}" -msgstr "Feil oppsto ved sending av {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Klarte ikke lese «{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 "" -"Ta et bilde av din GPS mottaker når den viser tid.
Vis bildet " -"her.
Skriv inn tidspunktet og velg tidssone
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Tidspunkt for foto (fra EXIF):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "Gps tidspunkt (lest i bildet ovenfor): " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [dd/mm/yyyy hh:mm:ss]" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 -msgid "I'm in the timezone of: " -msgstr "Jeg er i tidssonen: " - -#: ../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 "Ingen dato" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "Åpne et annet foto" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 -msgid "Synchronize time from a photo of the GPS receiver" -msgstr "Synkroniser tiden fra et bilde på GPS-mottakeren" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"Feil ved tolking av dato.\n" -"Sjekk format" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "Ugyldig dato" - -#: ../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 "GPX-spor: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Åpne flere GPX-spor" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -msgid "Timezone: " -msgstr "Tidssone: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 -msgid "Offset:" -msgstr "Forskyvning:" - -#: ../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 "" -"Jeg kan fotogragere min GPS mottaker.
Kan det være til hjelp?" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Opdater posisjon for: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Alle bilder" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Bilder uden EXIF-posisjon" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Bilder uten egenskaper" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 -msgid "Correlate images with GPX track" -msgstr "Jevnfør bilder med GPX spor" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Correlate" -msgstr "Jevnfør" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Automatisk forslag" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "Du bør velge et GPX-spor" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Intgen GPX-spor er valgt" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Feil ved tolking av tidssone.\n" -"Forventet format: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Ugyldig tidssone" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Feil ved tolking av forskyvning.\n" -"Forventet format: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Ugyldig forskyvning" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Fant {0} treff av {1} i GPX spor {2}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX-spor er lagt inn" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "Valgte foto har ikke tidskode." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Foto har ikke tidskode." - -#: ../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 "Valgte GPX spor mangler tidskode. Velg et annet spor." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX sporet har ikke tidskoder" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Tidssone: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minutter: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Sekunder: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Koplet {0} av {1} foto til GPX spor." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Tidsforskjell på {0} dager)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Forskyvning mellom spor og foto: {0}m {1}s" - -#: ../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 "" -"Klarte ikke synkronisere bildene med GPX-sporet. Bruk glidebryterne for å " -"synkronisere bildene manuelt." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "Klarte ikke å koble foto til sporet" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Juster tidssone og forskyvning" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Standardverdier" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433 -msgid "No image" -msgstr "Ingen bilder" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "Laster {0}" - -#: ../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 "Feil i fil {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11831,17 +12006,14 @@ #: ../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." -msgstr "" -"Et eget programtillegg for fransk Cadastre wms (matrikkel) på " -"www.cadastre.gouv.fr

Du finner betingelser for bruk her (på fransk): " -"
" +"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 "" +"Et eget programtillegg for fransk Cadastre wms (matrikkel) på www.cadastre." +"gouv.fr

Du finner betingelser for bruk her (på fransk):
" "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " "
før du laster inn data med dette programtillegget." @@ -11854,6 +12026,6 @@ msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -"Verdien på \"source\" er aktivisert ved automatisk " -"kildeangivelse" +"Verdien på \"source\" er aktivisert ved automatisk kildeangivelse" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 @@ -12159,12 +12331,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] "Forenkle linje (fjern {0} node)" -msgstr[1] "Forenkle linjer (fjern {0} noder)" - #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 @@ -12281,14 +12445,14 @@ msgstr "Farge Palett" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 +#: ../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 "Del område" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 msgid "Splits an area by an untagged way." msgstr "Deler et område med en umerket veg." -#: ../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 " @@ -12599,4 +12763,8 @@ msgstr "Åpne bilder med ImageWayPoint" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Last inn bildesett som et nyt lag." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -12640,18 +12808,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 "Reduserer antall punkter …" -#: ../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 "Kjører Douglas-Peucker-tilnærming …" -#: ../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 "Fjerner doble noder …" -#: ../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" @@ -12700,7 +12868,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12710,5 +12878,5 @@ #. 50000 #. -#. +#. #. #. @@ -12718,5 +12886,5 @@ #. 50000 #. -#. +#. #. #. @@ -12725,5 +12893,5 @@ #. 50000 #. -#. +#. #. #. @@ -12733,5 +12901,5 @@ #. 50000 #. -#. +#. #. #. @@ -12809,6 +12977,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 "" "Maksimalt antall segmenter tillatt i hver opptegnede linje. Standard er 250." @@ -12831,7 +12998,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 "" "Nøyaktighet på Douglas-Peucker linjeforenkling, målt i grader.
Lave " @@ -12899,20 +13065,19 @@ msgstr "Kunne ikke hente bilde" -#: ../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 "Kobler opp" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Tilkoblet" -#. 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 "Ikke Tilkoblet" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "Tilkobling mislykkes" @@ -13106,7 +13271,7 @@ "new server? (Strongly recommended)" msgstr "" -"Openstreetbugs-tillegget bruker den gamle tjeneren på " -"appspot.com.
En ny tjener er tilgjengelig på schokokeks.org.
Vil du " -"bytte til den nye tjeneren? (Anbefalt)" +"Openstreetbugs-tillegget bruker den gamle tjeneren på appspot.com." +"
En ny tjener er tilgjengelig på schokokeks.org.
Vil du bytte til den " +"nye tjeneren? (Anbefalt)" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 @@ -13134,6 +13299,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 "Header inneholder flere verdier og kan ikke kobles til enkelt streng" @@ -13218,9 +13382,10 @@ msgstr "Ukjent filtype {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 "Osmarender" -#: ../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 " @@ -13229,9 +13394,5 @@ "Fant ikke Firefox. Oppgi Firefox-programmet i siden for Kartinnstillinger." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "osmarender-indstillinger" - -#: ../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 "Firefox-programfil" @@ -13263,6 +13424,5 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "A plugin that allows JOSM to be controlled from other applications." -msgstr "" -"Et programtillegg som tillater at JOSM blir styrt av et annet program" +msgstr "Et programtillegg som tillater at JOSM blir styrt av et annet program" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 @@ -13612,17 +13772,17 @@ msgstr "Du må først oppgi kilde for objektmaler." -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" msgstr "Reverser terasseinndeling" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37 msgid "Reverses house numbers on a terrace." msgstr "Reverser hus nummer på terassehus." -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 msgid "Reverse a Terrace" msgstr "Reverser Terasseinndeling" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110 msgid "Reverse Terrace" msgstr "Reverser Terasseinndeling" @@ -13666,166 +13826,4 @@ msgid "Optional" msgstr "Tillegg" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "Slå sammen områder med overlapp" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Joins areas that overlap each other" -msgstr "Slår sammen områder med overlapp" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 -msgid "Only up to two areas can be joined at the moment." -msgstr "Bare to områder kan bli slått sammen foreløpig." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 -#, java-format -msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "«{0}» er ikke lukket, og kan derfor ikke være med i sammenføyning." - -#: ../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 "" -"De valgte linjene har noder utenfor nedlastet dataområde.\n" -"Dette kan medføre at noder blir slettet ved uhell.\n" -"Er du sikker på at du vil fortsette?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 -msgid "Please abort if you are not sure" -msgstr "Angre hvis du er usikker" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 -msgid "Please select at least one closed way the should be joined." -msgstr "Velg minst én lukket linje å sammenføye med." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175 -msgid "No intersection found. Nothing was changed." -msgstr "Fant ingen skjæring. Ingen endringer ble gjort." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197 -msgid "Added node on all intersections" -msgstr "Noder er lagt til i alle skjæringspunkt" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221 -msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "Slette indre linjer som ikke er del av multipolygon (relasjoner)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226 -msgid "Fix relations" -msgstr "Reparer relasjoner" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 -msgid "Joined self-overlapping area" -msgstr "Slo sammen områder som overlappet seg selv" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 -msgid "Joined overlapping areas" -msgstr "Slo sammen overlappende områder" - -#: ../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 "" -"Noen linjer er medlem i relasjoner som er endret. Sjekk at ingen feil har " -"oppstått." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 -msgid "Enter values for all conflicts." -msgstr "Legg inn verdier for alle konflikter." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Løs konflikter" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312 -msgid "Fix tag conflicts" -msgstr "Reparer konflikter i egenskaper." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462 -msgid "Removed Element from Relations" -msgstr "Fjernede Element fra Relasjoner" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571 -msgid "Join Areas: Remove Short Ways" -msgstr "Slå sammen arealer: fjern korte linjer" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587 -msgid "Closed Way" -msgstr "Lukket linje" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854 -msgid "Remove tags from inner ways" -msgstr "Fjern egenskaper fra indre linjer" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883 -msgid "Join Areas Function" -msgstr "Funksjon Slå sammen Areal" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Jump To Position" -msgstr "Gå til Posisjon" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Opens a dialog that allows to jump to a specific location" -msgstr "Åpner dialog som lar deg gå til bestemt posisjon" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 -msgid "Enter Lat/Lon to jump to position." -msgstr "Gi inn Lat/Lon for posisjon du vil gå til" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 -msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "Du kan også lime inn URL fra www.openstreetmap.org" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 -msgid "Zoom (in metres)" -msgstr "Zoom (i meter)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -msgid "Jump there" -msgstr "Gå dit" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 -msgid "Jump to Position" -msgstr "Gå til posisjon" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Could not parse Latitude, Longitude or Zoom. Please check." -msgstr "Kunne ikke tolke Lat / Lon eller zoom. Sjekk input." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Unable to parse Lon/Lat" -msgstr "Kunne ikke tolke Lat / Lon" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Simplify Way" -msgstr "Forenkle linje" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Slett overflødige noder fra en linje." - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "Velg minst én linje å forenkle." - -#: ../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] "Utvalget har {0} linje. Er du sikker på at du vil forenkle denne?" -msgstr[1] "" -"Utvalget har {0} linjer. Er du sikker på at du vil forenkle disse?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "Er du sikker?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13925,5 +13923,5 @@ msgstr "gyldighetssjekk – annet" -#: ../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}" @@ -13976,34 +13974,34 @@ msgstr "Ignorer valgte feilmeldinger neste gang." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Hele gruppen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Enkelte element" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Intet" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Ignorer hele gruppen eller enkelte element?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 msgid "Ignoring elements" msgstr "Ignorerer element" -#: ../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 "" @@ -14052,18 +14050,18 @@ msgstr "Kryssende veier" -#: ../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 "Dobbelt-Noder" -#: ../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 "Denne testen sjekker at det ikke er flere Noder med samme posisjon." -#: ../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 "" @@ -14182,6 +14180,5 @@ msgid "" "This test checks for ways with similar names that may have been misspelled." -msgstr "" -"Denne test sjekker linjer med liknende navn, som kan bety feilstaving." +msgstr "Denne test sjekker linjer med liknende navn, som kan bety feilstaving." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 @@ -14297,11 +14294,9 @@ #: ../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." -msgstr "" -"Kildene (URL eller filnavn) for stavekontroll (se " -"http://wiki.openstreetmap.org/index.php/User:JLS/speller) eller \"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 "" +"Kildene (URL eller filnavn) for stavekontroll (se http://wiki.openstreetmap." +"org/index.php/User:JLS/speller) eller \"tag checking data files\"." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 @@ -14443,5 +14438,5 @@ #. 50000 #. -#. +#. #. #. @@ -14449,5 +14444,5 @@ #. #. -#. +#. #. #. @@ -14457,5 +14452,5 @@ #. 50000 #. -#. +#. #. #. @@ -14464,5 +14459,5 @@ #. 50000 #. -#. +#. #. #. @@ -14471,5 +14466,5 @@ #. 50000 #. -#. +#. #. #. @@ -14478,5 +14473,5 @@ #. 50000 #. -#. +#. #. #. @@ -14485,5 +14480,5 @@ #. 50000 #. -#. +#. #. #. @@ -14492,9 +14487,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14539,5 +14534,5 @@ #. 50000 #. -#. +#. #. #. @@ -14582,6 +14577,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38 msgid "This test checks for untagged nodes that are not part of any way." -msgstr "" -"Sjekker for noder uten egenskaper som heller ikke tilhører noen linje." +msgstr "Sjekker for noder uten egenskaper som heller ikke tilhører noen linje." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59 @@ -14619,6 +14613,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35 msgid "This test checks the direction of water, land and coastline ways." -msgstr "" -"Testen finner linjer som elver, land eller kystlinje med feil retning." +msgstr "Testen finner linjer som elver, land eller kystlinje med feil retning." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69 @@ -14672,14 +14665,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 " @@ -14688,14 +14681,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 "" @@ -14704,5 +14697,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 "" @@ -14714,13 +14707,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." @@ -14876,50 +14869,50 @@ msgstr "Du har bestilt for stort område. Zoom inn eller bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "Last ned synlige kartbilder" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "Bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Reload erroneous tiles" msgstr "Last ned kartbilder med feil på nytt" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:369 msgid "Save WMS layer to file" msgstr "Lagre WMS lag til fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "Lagre WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "les inn WMS lag fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "Last inn WMS-lag" -#: ../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 "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "File Format Error" msgstr "Feil Fil Format" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "Feil ved lasting av fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -14995,5 +14988,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 "" @@ -15035,23 +15028,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 "" -"Et annet geotag programtillegg for JOSM. Kobler bilder med GPS spor eller " -"importerer bilder med koordinater i EXIF." - -#. Plugin cadastre-fr -#: build/trans_plugins.java:7 msgid "A special handler for the French land registry WMS server." msgstr "En spesiell håntering for det franske landregisterets WMS tjener" #. Plugin colorscheme -#: build/trans_plugins.java:9 +#: build/trans_plugins.java:7 msgid "" "Allows the user to create different color schemes and to switch between " @@ -15067,10 +15053,10 @@ #. Plugin Create_grid_of_ways -#: build/trans_plugins.java:11 +#: build/trans_plugins.java:9 msgid "Create a grid of ways." msgstr "Lag et rutenett med linjer." #. Plugin czechaddress -#: build/trans_plugins.java:13 +#: build/trans_plugins.java:11 msgid "" "Creating and handling address nodes and buildings within Czech Republic." @@ -15078,10 +15064,10 @@ #. Plugin dataimport -#: build/trans_plugins.java:15 +#: build/trans_plugins.java:13 msgid "Allows to import various file formats into JOSM directly." msgstr "Lar deg importere forskjellige dataformater direkte i JOSM." #. Plugin DirectUpload -#: build/trans_plugins.java:17 +#: build/trans_plugins.java:15 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " @@ -15092,10 +15078,10 @@ #. Plugin Duplicate-Way -#: build/trans_plugins.java:19 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "Dupliser linjer med parallell avstand" #. Plugin editgpx -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -15105,21 +15091,20 @@ #. Plugin globalsat +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." +msgstr "Last ned GPS punkt fra Globalsat dg100 data logger direkte til JOSM" + +#. Plugin graphview #: build/trans_plugins.java:23 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." -msgstr "Last ned GPS punkt fra Globalsat dg100 data logger direkte til JOSM" - -#. 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 -#: build/trans_plugins.java:27 msgid "Provide a background layer that displays a map grid" msgstr "Bakgrunnslag som viser rutenettet i kartet" #. Plugin ImageWayPoint -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -15132,10 +15117,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "For vektorisering av WMS bilder." #. Plugin livegps -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -15145,5 +15130,5 @@ #. Plugin measurement -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -15156,10 +15141,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 " @@ -15168,5 +15153,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 " @@ -15179,15 +15164,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:41 msgid "Displays an OpenLayers background image" msgstr "Viser bakgrunnsbildet i et åpent lag" #. Plugin openstreetbugs -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:43 msgid "Imports issues from OpenStreetBugs" msgstr "Importerer tema fra OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:45 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -15195,5 +15180,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:47 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -15201,5 +15186,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:49 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -15210,15 +15195,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:51 msgid "The great JGoodies Plastic Look and Feel." msgstr "JGoodies Plastic Look and Feel." #. Plugin remotecontrol -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:53 msgid "Let other applications send commands to JOSM." msgstr "La andre program sende kommandoer til JOSM." #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15229,10 +15214,10 @@ #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:57 msgid "Provides routing capabilities." msgstr "Gir deg Ruteplanlegger på OSM data." #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:59 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -15243,15 +15228,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:61 msgid "Allow adding markers/nodes on current gps positions." msgstr "Legger inn markører eller Noder på gps posisjon." #. Plugin tageditor -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:63 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Dialog for å redigere egenskaper i en tabell." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:65 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -15264,19 +15249,10 @@ #. Plugin terracer -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:67 msgid "Make terraced houses out of single blocks." msgstr "Lager rekkehus / terassehus fra en enkel husblokk." -#. 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 "" -"Flere verktøy som kan gjøre livet enklere. Eksempel: forenkle linje, Slå " -"sammen areal, gå til posisjon." - #. Plugin validator -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -15287,5 +15263,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15294,14 +15270,13 @@ #. Plugin waydownloader -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier." #. Plugin wmsplugin -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." -msgstr "" -"Vis koordinatfestet bilde som bakgrunn i JOSM (WMS-tjenere, Yahoo, …)." +msgstr "Vis koordinatfestet bilde som bakgrunn i JOSM (WMS-tjenere, Yahoo, …)." #. #. -#. +#. #. #. @@ -16549,5 +16524,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16557,5 +16532,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16574,5 +16549,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16582,5 +16557,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16599,5 +16574,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16607,5 +16582,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16624,5 +16599,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16632,5 +16607,5 @@ #. 300000 #. -#. +#. #. #. @@ -16645,5 +16620,5 @@ #. 300000 #. -#. +#. #. #. @@ -16661,5 +16636,5 @@ #. 50000 #. -#. +#. #. #. @@ -16677,5 +16652,5 @@ #. 40000 #. -#. +#. #. #. @@ -16684,5 +16659,5 @@ #. 40000 #. -#. +#. #. #. @@ -16692,5 +16667,5 @@ #. 50000 #. -#. +#. #. #. @@ -16710,5 +16685,5 @@ #. 50000 #. -#. +#. #. #. @@ -16717,5 +16692,5 @@ #. 50000 #. -#. +#. #. #. @@ -16725,5 +16700,5 @@ #. 50000 #. -#. +#. #. #. @@ -16773,7 +16748,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17472,5 +17447,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17509,5 +17484,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17603,5 +17578,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17758,5 +17733,5 @@ #. 50000 #. -#. +#. #. #. @@ -19143,5 +19118,5 @@ #. 30000 #. -#. +#. #. #. @@ -19151,5 +19126,5 @@ #. 40000 #. -#. +#. #. #. @@ -19159,5 +19134,5 @@ #. 20000 #. -#. +#. #. #. @@ -19167,5 +19142,5 @@ #. 40000 #. -#. +#. #. #. @@ -19523,7 +19498,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19533,5 +19508,5 @@ #. 50000 #. -#. +#. #. #. @@ -19541,5 +19516,5 @@ #. 50000 #. -#. +#. #. #. @@ -19549,5 +19524,5 @@ #. 50000 #. -#. +#. #. #. @@ -19557,5 +19532,5 @@ #. 50000 #. -#. +#. #. #. @@ -19565,5 +19540,5 @@ #. 50000 #. -#. +#. #. #. @@ -19573,5 +19548,5 @@ #. 50000 #. -#. +#. #. #. @@ -19581,5 +19556,5 @@ #. 50000 #. -#. +#. #. #. @@ -19589,5 +19564,5 @@ #. 50000 #. -#. +#. #. #. @@ -19597,5 +19572,5 @@ #. 50000 #. -#. +#. #. #. @@ -19605,5 +19580,5 @@ #. 50000 #. -#. +#. #. #. @@ -19613,5 +19588,5 @@ #. 50000 #. -#. +#. #. #. @@ -19621,5 +19596,5 @@ #. 50000 #. -#. +#. #. #. @@ -19629,5 +19604,5 @@ #. 50000 #. -#. +#. #. #. @@ -19637,5 +19612,5 @@ #. 50000 #. -#. +#. #. #. @@ -19645,5 +19620,5 @@ #. 50000 #. -#. +#. #. #. @@ -19653,5 +19628,5 @@ #. 50000 #. -#. +#. #. #. @@ -19661,5 +19636,5 @@ #. 50000 #. -#. +#. #. #. @@ -19669,5 +19644,5 @@ #. 50000 #. -#. +#. #. #. @@ -19677,5 +19652,5 @@ #. 50000 #. -#. +#. #. #. @@ -19685,5 +19660,5 @@ #. 50000 #. -#. +#. #. #. @@ -19693,5 +19668,5 @@ #. 50000 #. -#. +#. #. #. @@ -19701,5 +19676,5 @@ #. 50000 #. -#. +#. #. #. @@ -19709,5 +19684,5 @@ #. 50000 #. -#. +#. #. #. @@ -19717,5 +19692,5 @@ #. 50000 #. -#. +#. #. #. @@ -19725,5 +19700,5 @@ #. 50000 #. -#. +#. #. #. @@ -19733,5 +19708,5 @@ #. 50000 #. -#. +#. #. #. @@ -19741,5 +19716,5 @@ #. 50000 #. -#. +#. #. #. @@ -19749,5 +19724,5 @@ #. 50000 #. -#. +#. #. #. @@ -19757,5 +19732,5 @@ #. 50000 #. -#. +#. #. #. @@ -19765,5 +19740,5 @@ #. 50000 #. -#. +#. #. #. @@ -19773,5 +19748,5 @@ #. 50000 #. -#. +#. #. #. @@ -19781,5 +19756,5 @@ #. 50000 #. -#. +#. #. #. @@ -19789,5 +19764,5 @@ #. 50000 #. -#. +#. #. #. @@ -19797,5 +19772,5 @@ #. 50000 #. -#. +#. #. #. @@ -19805,5 +19780,5 @@ #. 50000 #. -#. +#. #. #. @@ -19813,5 +19788,5 @@ #. 50000 #. -#. +#. #. #. @@ -19821,5 +19796,5 @@ #. 50000 #. -#. +#. #. #. @@ -19829,5 +19804,5 @@ #. 50000 #. -#. +#. #. #. @@ -19837,5 +19812,5 @@ #. 50000 #. -#. +#. #. #. @@ -19845,5 +19820,5 @@ #. 50000 #. -#. +#. #. #. @@ -19853,5 +19828,5 @@ #. 50000 #. -#. +#. #. #. @@ -19861,5 +19836,5 @@ #. 50000 #. -#. +#. #. #. @@ -19869,5 +19844,5 @@ #. 50000 #. -#. +#. #. #. @@ -19877,5 +19852,5 @@ #. 50000 #. -#. +#. #. #. @@ -19885,5 +19860,5 @@ #. 50000 #. -#. +#. #. #. @@ -19893,5 +19868,5 @@ #. 50000 #. -#. +#. #. #. @@ -21585,7 +21560,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21595,5 +21570,5 @@ #. 50000 #. -#. +#. #. #. @@ -21603,5 +21578,5 @@ #. 50000 #. -#. +#. #. #. @@ -21611,5 +21586,5 @@ #. 50000 #. -#. +#. #. #. @@ -21619,5 +21594,5 @@ #. 50000 #. -#. +#. #. #. @@ -21627,5 +21602,5 @@ #. 50000 #. -#. +#. #. #. @@ -21635,5 +21610,5 @@ #. 50000 #. -#. +#. #. #. @@ -21643,5 +21618,5 @@ #. 50000 #. -#. +#. #. #. @@ -22972,5 +22947,5 @@ #. 40000 #. -#. +#. #. #. @@ -22986,5 +22961,5 @@ #. 30000 #. -#. +#. #. #. @@ -22995,7 +22970,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23005,5 +22980,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -23013,13 +22996,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -23029,5 +23004,5 @@ #. 50000 #. -#. +#. #. #. @@ -23060,5 +23035,5 @@ #. 50000 #. -#. +#. #. #. @@ -23074,5 +23049,5 @@ #. 50000 #. -#. +#. #. #. @@ -23082,5 +23057,5 @@ #. 10000 #. -#. +#. #. #. @@ -23090,5 +23065,5 @@ #. 10000 #. -#. +#. #. #. @@ -23099,5 +23074,5 @@ #. 10000 #. -#. +#. #. #. @@ -23126,5 +23101,5 @@ #. 50000 #. -#. +#. #. #. @@ -23239,9 +23214,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 @@ -23249,5 +23224,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, @@ -23257,8 +23232,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 @@ -23272,5 +23247,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23278,5 +23253,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23325,6 +23300,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23404,5 +23379,5 @@ #. 40000 #. -#. +#. #. #. @@ -23412,5 +23387,5 @@ #. 10000 #. -#. +#. #. #. @@ -23419,5 +23394,5 @@ #. 50000 #. -#. +#. #. #. @@ -23427,5 +23402,5 @@ #. 50000 #. -#. +#. #. #. @@ -23434,5 +23409,5 @@ #. 50000 #. -#. +#. #. #. @@ -23441,5 +23416,5 @@ #. 50000 #. -#. +#. #. #. @@ -23448,5 +23423,5 @@ #. 50000 #. -#. +#. #. #. @@ -23455,5 +23430,5 @@ #. 50000 #. -#. +#. #. #. @@ -23462,5 +23437,5 @@ #. 40000 #. -#. +#. #. #. @@ -23469,5 +23444,5 @@ #. 50000 #. -#. +#. #. #. @@ -23476,5 +23451,5 @@ #. 50000 #. -#. +#. #. #. @@ -23483,5 +23458,5 @@ #. 50000 #. -#. +#. #. #. @@ -23490,5 +23465,5 @@ #. 50000 #. -#. +#. #. #. @@ -23497,5 +23472,5 @@ #. 50000 #. -#. +#. #. #. @@ -23504,5 +23479,5 @@ #. 50000 #. -#. +#. #. #. @@ -23512,5 +23487,5 @@ #. 50000 #. -#. +#. #. #. @@ -23519,5 +23494,5 @@ #. 50000 #. -#. +#. #. #. @@ -23528,5 +23503,5 @@ #. 50000 #. -#. +#. #. #. @@ -23538,11 +23513,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23551,7 +23526,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23562,5 +23537,5 @@ #. 50000 #. -#. +#. #. #. @@ -23571,5 +23546,5 @@ #. 50000 #. -#. +#. #. #. @@ -23580,5 +23555,5 @@ #. 50000 #. -#. +#. #. #. @@ -23589,5 +23564,5 @@ #. 50000 #. -#. +#. #. #. @@ -23598,5 +23573,5 @@ #. 50000 #. -#. +#. #. #. @@ -23607,5 +23582,5 @@ #. 40000 #. -#. +#. #. #. @@ -23617,5 +23592,5 @@ #. 50000 #. -#. +#. #. #. @@ -23626,5 +23601,5 @@ #. 50000 #. -#. +#. #. #. @@ -23649,5 +23624,5 @@ #. 10000 #. -#. +#. #. #. @@ -23656,5 +23631,5 @@ #. 50000 #. -#. +#. #. #. @@ -23663,5 +23638,5 @@ #. 50000 #. -#. +#. #. #. @@ -23677,5 +23652,5 @@ #. 20000 #. -#. +#. #. #. @@ -23689,5 +23664,5 @@ #. 30000 #. -#. +#. #. #. @@ -23696,5 +23671,5 @@ #. 50000 #. -#. +#. #. #. @@ -23703,5 +23678,5 @@ #. 50000 #. -#. +#. #. #. @@ -23710,5 +23685,5 @@ #. 50000 #. -#. +#. #. #. @@ -23717,5 +23692,5 @@ #. 50000 #. -#. +#. #. #. @@ -23724,5 +23699,5 @@ #. 50000 #. -#. +#. #. #. @@ -23731,5 +23706,5 @@ #. 50000 #. -#. +#. #. #. @@ -23738,5 +23713,5 @@ #. 50000 #. -#. +#. #. #. @@ -23745,5 +23720,5 @@ #. 50000 #. -#. +#. #. #. @@ -23752,5 +23727,5 @@ #. 50000 #. -#. +#. #. #. @@ -23759,5 +23734,5 @@ #. 50000 #. -#. +#. #. #. @@ -23766,5 +23741,5 @@ #. 50000 #. -#. +#. #. #. @@ -23773,5 +23748,5 @@ #. 50000 #. -#. +#. #. #. @@ -23780,5 +23755,5 @@ #. 50000 #. -#. +#. #. #. @@ -23787,5 +23762,5 @@ #. 50000 #. -#. +#. #. #. @@ -23956,7 +23931,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23970,5 +23945,5 @@ #. 40000 #. -#. +#. #. #. @@ -23978,7 +23953,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23988,5 +23963,5 @@ #. 50000 #. -#. +#. #. #. @@ -23996,5 +23971,5 @@ #. 50000 #. -#. +#. #. #. @@ -24004,5 +23979,5 @@ #. 50000 #. -#. +#. #. #. @@ -24012,5 +23987,5 @@ #. 50000 #. -#. +#. #. #. @@ -24026,5 +24001,5 @@ #. 10000 #. -#. +#. #. #. @@ -24034,5 +24009,5 @@ #. 50000 #. -#. +#. #. #. @@ -24042,5 +24017,5 @@ #. 50000 #. -#. +#. #. #. @@ -24050,5 +24025,5 @@ #. 50000 #. -#. +#. #. #. @@ -24058,5 +24033,5 @@ #. 50000 #. -#. +#. #. #. @@ -24066,5 +24041,5 @@ #. 50000 #. -#. +#. #. #. @@ -24074,5 +24049,5 @@ #. 50000 #. -#. +#. #. #. @@ -24091,5 +24066,5 @@ #. 50000 #. -#. +#. #. #. @@ -24098,5 +24073,5 @@ #. 50000 #. -#. +#. #. #. @@ -24110,5 +24085,5 @@ #. 50000 #. -#. +#. #. #. @@ -24122,5 +24097,5 @@ #. 50000 #. -#. +#. #. #. @@ -24129,5 +24104,5 @@ #. 50000 #. -#. +#. #. #. @@ -24141,5 +24116,5 @@ #. 50000 #. -#. +#. #. #. @@ -24154,5 +24129,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24167,5 +24142,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24179,5 +24154,5 @@ #. 50000 #. -#. +#. #. #. @@ -24191,5 +24166,5 @@ #. 50000 #. -#. +#. #. #. @@ -24198,5 +24173,5 @@ #. 50000 #. -#. +#. #. #. @@ -24205,5 +24180,5 @@ #. 50000 #. -#. +#. #. #. @@ -24217,5 +24192,5 @@ #. 50000 #. -#. +#. #. #. @@ -24225,5 +24200,5 @@ #. 50000 #. -#. +#. #. #. @@ -24232,5 +24207,5 @@ #. 50000 #. -#. +#. #. #. @@ -24239,5 +24214,5 @@ #. 50000 #. -#. +#. #. #. @@ -24246,5 +24221,5 @@ #. 50000 #. -#. +#. #. #. @@ -24254,5 +24229,5 @@ #. 50000 #. -#. +#. #. #. @@ -24263,5 +24238,5 @@ #. 50000 #. -#. +#. #. #. @@ -24271,7 +24246,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24281,5 +24256,5 @@ #. 50000 #. -#. +#. #. #. @@ -24289,5 +24264,5 @@ #. 50000 #. -#. +#. #. #. @@ -24297,5 +24272,5 @@ #. 50000 #. -#. +#. #. #. @@ -24306,5 +24281,5 @@ #. 50000 #. -#. +#. #. #. @@ -24314,5 +24289,5 @@ #. 50000 #. -#. +#. #. #. @@ -24322,5 +24297,5 @@ #. 50000 #. -#. +#. #. #. @@ -24330,5 +24305,5 @@ #. 50000 #. -#. +#. #. #. @@ -24338,5 +24313,5 @@ #. 50000 #. -#. +#. #. #. @@ -24346,5 +24321,5 @@ #. 50000 #. -#. +#. #. #. @@ -24354,5 +24329,5 @@ #. 50000 #. -#. +#. #. #. @@ -24362,5 +24337,5 @@ #. 50000 #. -#. +#. #. #. @@ -24370,5 +24345,5 @@ #. 50000 #. -#. +#. #. #. @@ -24391,7 +24366,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24401,5 +24376,5 @@ #. 50000 #. -#. +#. #. #. @@ -24408,5 +24383,5 @@ #. 50000 #. -#. +#. #. #. @@ -24416,5 +24391,5 @@ #. 50000 #. -#. +#. #. #. @@ -24423,5 +24398,5 @@ #. 50000 #. -#. +#. #. #. @@ -24431,5 +24406,5 @@ #. 50000 #. -#. +#. #. #. @@ -24439,5 +24414,5 @@ #. 50000 #. -#. +#. #. #. @@ -24453,5 +24428,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24462,5 +24437,5 @@ #. 50000 #. -#. +#. #. #. @@ -24479,5 +24454,5 @@ #. 50000 #. -#. +#. #. #. @@ -24487,5 +24462,5 @@ #. 50000 #. -#. +#. #. #. @@ -24498,5 +24473,5 @@ #. 50000 #. -#. +#. #. #. @@ -24514,5 +24489,5 @@ #. 50000 #. -#. +#. #. #. @@ -24521,5 +24496,5 @@ #. 50000 #. -#. +#. #. #. @@ -24528,5 +24503,5 @@ #. 50000 #. -#. +#. #. #. @@ -24535,7 +24510,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24546,5 +24521,5 @@ #. 50000 #. -#. +#. #. #. @@ -24559,5 +24534,5 @@ #. 50000 #. -#. +#. #. #. @@ -24571,5 +24546,5 @@ #. 50000 #. -#. +#. #. #. @@ -24579,5 +24554,5 @@ #. 50000 #. -#. +#. #. #. @@ -24591,5 +24566,5 @@ #. 50000 #. -#. +#. #. #. @@ -24603,5 +24578,5 @@ #. 50000 #. -#. +#. #. #. @@ -24610,7 +24585,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24620,5 +24595,5 @@ #. 50000 #. -#. +#. #. #. @@ -24628,5 +24603,5 @@ #. 50000 #. -#. +#. #. #. @@ -24636,5 +24611,5 @@ #. 50000 #. -#. +#. #. #. @@ -24644,5 +24619,5 @@ #. 50000 #. -#. +#. #. #. @@ -24658,7 +24633,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24673,5 +24648,5 @@ #. 30000 #. -#. +#. #. #. @@ -24686,5 +24661,5 @@ #. 30000 #. -#. +#. #. #. @@ -24699,5 +24674,5 @@ #. 30000 #. -#. +#. #. #. @@ -24712,5 +24687,5 @@ #. 30000 #. -#. +#. #. #. @@ -24725,5 +24700,5 @@ #. 30000 #. -#. +#. #. #. @@ -24738,7 +24713,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24748,5 +24723,5 @@ #. 50000 #. -#. +#. #. #. @@ -24755,5 +24730,5 @@ #. 50000 #. -#. +#. #. #. @@ -24763,5 +24738,5 @@ #. 50000 #. -#. +#. #. #. @@ -24771,5 +24746,5 @@ #. 50000 #. -#. +#. #. #. @@ -24779,5 +24754,5 @@ #. 50000 #. -#. +#. #. #. @@ -24787,5 +24762,5 @@ #. 50000 #. -#. +#. #. #. @@ -24795,5 +24770,5 @@ #. 50000 #. -#. +#. #. #. @@ -24803,5 +24778,5 @@ #. 50000 #. -#. +#. #. #. @@ -24811,5 +24786,5 @@ #. 50000 #. -#. +#. #. #. @@ -24819,5 +24794,5 @@ #. 50000 #. -#. +#. #. #. @@ -24827,5 +24802,5 @@ #. 50000 #. -#. +#. #. #. @@ -24835,5 +24810,5 @@ #. 50000 #. -#. +#. #. #. @@ -24843,5 +24818,5 @@ #. 50000 #. -#. +#. #. #. @@ -24861,5 +24836,5 @@ #. 50000 #. -#. +#. #. #. @@ -24874,5 +24849,5 @@ #. 50000 #. -#. +#. #. #. @@ -24885,7 +24860,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24895,5 +24870,5 @@ #. 50000 #. -#. +#. #. #. @@ -24903,5 +24878,5 @@ #. 50000 #. -#. +#. #. #. @@ -24911,5 +24886,5 @@ #. 50000 #. -#. +#. #. #. @@ -24919,5 +24894,5 @@ #. 50000 #. -#. +#. #. #. @@ -24927,5 +24902,5 @@ #. 50000 #. -#. +#. #. #. @@ -24935,5 +24910,5 @@ #. 50000 #. -#. +#. #. #. @@ -24943,5 +24918,5 @@ #. 50000 #. -#. +#. #. #. @@ -24951,5 +24926,5 @@ #. 50000 #. -#. +#. #. #. @@ -24959,5 +24934,5 @@ #. 50000 #. -#. +#. #. #. @@ -24967,5 +24942,5 @@ #. 50000 #. -#. +#. #. #. @@ -24975,5 +24950,5 @@ #. 50000 #. -#. +#. #. #. @@ -24983,5 +24958,5 @@ #. 50000 #. -#. +#. #. #. @@ -24991,5 +24966,5 @@ #. 50000 #. -#. +#. #. #. @@ -24999,5 +24974,5 @@ #. 50000 #. -#. +#. #. #. @@ -25018,5 +24993,5 @@ #. 50000 #. -#. +#. #. #. @@ -25030,7 +25005,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25040,5 +25015,5 @@ #. 50000 #. -#. +#. #. #. @@ -25048,5 +25023,5 @@ #. 50000 #. -#. +#. #. #. @@ -25056,5 +25031,5 @@ #. 50000 #. -#. +#. #. #. @@ -25064,5 +25039,5 @@ #. 50000 #. -#. +#. #. #. @@ -25072,5 +25047,5 @@ #. 50000 #. -#. +#. #. #. @@ -25080,5 +25055,5 @@ #. 50000 #. -#. +#. #. #. @@ -25088,5 +25063,5 @@ #. 50000 #. -#. +#. #. #. @@ -25103,5 +25078,5 @@ #. 50000 #. -#. +#. #. #. @@ -25111,5 +25086,5 @@ #. 50000 #. -#. +#. #. #. @@ -25119,5 +25094,5 @@ #. 50000 #. -#. +#. #. #. @@ -25127,5 +25102,5 @@ #. 50000 #. -#. +#. #. #. @@ -25135,5 +25110,5 @@ #. 50000 #. -#. +#. #. #. @@ -25143,5 +25118,5 @@ #. 50000 #. -#. +#. #. #. @@ -25151,5 +25126,5 @@ #. 50000 #. -#. +#. #. #. @@ -25159,5 +25134,5 @@ #. 50000 #. -#. +#. #. #. @@ -25167,5 +25142,5 @@ #. 50000 #. -#. +#. #. #. @@ -25175,5 +25150,5 @@ #. 50000 #. -#. +#. #. #. @@ -25183,5 +25158,5 @@ #. 50000 #. -#. +#. #. #. @@ -25191,5 +25166,5 @@ #. 50000 #. -#. +#. #. #. @@ -25208,5 +25183,5 @@ #. 50000 #. -#. +#. #. #. @@ -25216,5 +25191,5 @@ #. 50000 #. -#. +#. #. #. @@ -25223,5 +25198,5 @@ #. 50000 #. -#. +#. #. #. @@ -25231,5 +25206,5 @@ #. 50000 #. -#. +#. #. #. @@ -25239,5 +25214,5 @@ #. 50000 #. -#. +#. #. #. @@ -25247,5 +25222,5 @@ #. 50000 #. -#. +#. #. #. @@ -25254,5 +25229,5 @@ #. 50000 #. -#. +#. #. #. @@ -25262,5 +25237,5 @@ #. 50000 #. -#. +#. #. #. @@ -25270,5 +25245,5 @@ #. 50000 #. -#. +#. #. #. @@ -25278,5 +25253,5 @@ #. 50000 #. -#. +#. #. #. @@ -25286,5 +25261,5 @@ #. 50000 #. -#. +#. #. #. @@ -25293,5 +25268,5 @@ #. 50000 #. -#. +#. #. #. @@ -25300,5 +25275,5 @@ #. 50000 #. -#. +#. #. #. @@ -25307,5 +25282,5 @@ #. 50000 #. -#. +#. #. #. @@ -25314,5 +25289,5 @@ #. 50000 #. -#. +#. #. #. @@ -25321,5 +25296,5 @@ #. 50000 #. -#. +#. #. #. @@ -25328,5 +25303,5 @@ #. 50000 #. -#. +#. #. #. @@ -25335,5 +25310,5 @@ #. 50000 #. -#. +#. #. #. @@ -25342,5 +25317,5 @@ #. 50000 #. -#. +#. #. #. @@ -25349,5 +25324,5 @@ #. 50000 #. -#. +#. #. #. @@ -25356,5 +25331,5 @@ #. 50000 #. -#. +#. #. #. @@ -25363,5 +25338,5 @@ #. 50000 #. -#. +#. #. #. @@ -25370,5 +25345,5 @@ #. 50000 #. -#. +#. #. #. @@ -25377,5 +25352,5 @@ #. 50000 #. -#. +#. #. #. @@ -25385,5 +25360,5 @@ #. 50000 #. -#. +#. #. #. @@ -25393,5 +25368,5 @@ #. 50000 #. -#. +#. #. #. @@ -25401,5 +25376,5 @@ #. 50000 #. -#. +#. #. #. @@ -25409,5 +25384,5 @@ #. 50000 #. -#. +#. #. #. @@ -25417,5 +25392,5 @@ #. 50000 #. -#. +#. #. #. @@ -25425,5 +25400,5 @@ #. 50000 #. -#. +#. #. #. @@ -25433,5 +25408,5 @@ #. 50000 #. -#. +#. #. #. @@ -25441,5 +25416,5 @@ #. 50000 #. -#. +#. #. #. @@ -25449,5 +25424,5 @@ #. 50000 #. -#. +#. #. #. @@ -25458,5 +25433,5 @@ #. 50000 #. -#. +#. #. #. @@ -25466,5 +25441,5 @@ #. 50000 #. -#. +#. #. #. @@ -25474,5 +25449,5 @@ #. 50000 #. -#. +#. #. #. @@ -25482,5 +25457,5 @@ #. 50000 #. -#. +#. #. #. @@ -25490,5 +25465,5 @@ #. 50000 #. -#. +#. #. #. @@ -25498,5 +25473,5 @@ #. 50000 #. -#. +#. #. #. @@ -25506,5 +25481,5 @@ #. 50000 #. -#. +#. #. #. @@ -25514,5 +25489,5 @@ #. 50000 #. -#. +#. #. #. @@ -25522,5 +25497,5 @@ #. 50000 #. -#. +#. #. #. @@ -25530,5 +25505,5 @@ #. 50000 #. -#. +#. #. #. @@ -25538,5 +25513,5 @@ #. 50000 #. -#. +#. #. #. @@ -25546,5 +25521,5 @@ #. 50000 #. -#. +#. #. #. @@ -25554,5 +25529,5 @@ #. 50000 #. -#. +#. #. #. @@ -25562,5 +25537,5 @@ #. 50000 #. -#. +#. #. #. @@ -25570,5 +25545,5 @@ #. 50000 #. -#. +#. #. #. @@ -25578,5 +25553,5 @@ #. 50000 #. -#. +#. #. #. @@ -25586,5 +25561,5 @@ #. 50000 #. -#. +#. #. #. @@ -25594,5 +25569,5 @@ #. 50000 #. -#. +#. #. #. @@ -25602,5 +25577,5 @@ #. 50000 #. -#. +#. #. #. @@ -25609,5 +25584,5 @@ #. 50000 #. -#. +#. #. #. @@ -25639,5 +25614,5 @@ #. 50000 #. -#. +#. #. #. @@ -25647,5 +25622,5 @@ #. 50000 #. -#. +#. #. #. @@ -25655,7 +25630,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25670,5 +25645,5 @@ #. 50000 #. -#. +#. #. #. @@ -25678,5 +25653,5 @@ #. 50000 #. -#. +#. #. #. @@ -25686,5 +25661,5 @@ #. 50000 #. -#. +#. #. #. @@ -25694,5 +25669,5 @@ #. 50000 #. -#. +#. #. #. @@ -25702,5 +25677,5 @@ #. 50000 #. -#. +#. #. #. @@ -25710,5 +25685,5 @@ #. 50000 #. -#. +#. #. #. @@ -25718,5 +25693,5 @@ #. 50000 #. -#. +#. #. #. @@ -25732,7 +25707,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25742,5 +25717,5 @@ #. 50000 #. -#. +#. #. #. @@ -25750,5 +25725,5 @@ #. 50000 #. -#. +#. #. #. @@ -25758,5 +25733,5 @@ #. 50000 #. -#. +#. #. #. @@ -25766,5 +25741,5 @@ #. 50000 #. -#. +#. #. #. @@ -25774,5 +25749,5 @@ #. 50000 #. -#. +#. #. #. @@ -25782,5 +25757,5 @@ #. 50000 #. -#. +#. #. #. @@ -25790,5 +25765,5 @@ #. 50000 #. -#. +#. #. #. @@ -25798,5 +25773,5 @@ #. 50000 #. -#. +#. #. #. @@ -25806,5 +25781,5 @@ #. 50000 #. -#. +#. #. #. @@ -25814,5 +25789,5 @@ #. 50000 #. -#. +#. #. #. @@ -25822,5 +25797,5 @@ #. 50000 #. -#. +#. #. #. @@ -25830,5 +25805,5 @@ #. 50000 #. -#. +#. #. #. @@ -25838,5 +25813,5 @@ #. 50000 #. -#. +#. #. #. @@ -25846,5 +25821,5 @@ #. 50000 #. -#. +#. #. #. @@ -25854,5 +25829,5 @@ #. 50000 #. -#. +#. #. #. @@ -25862,5 +25837,5 @@ #. 50000 #. -#. +#. #. #. @@ -25870,5 +25845,5 @@ #. 50000 #. -#. +#. #. #. @@ -25878,5 +25853,5 @@ #. 50000 #. -#. +#. #. #. @@ -25886,5 +25861,5 @@ #. 50000 #. -#. +#. #. #. @@ -25894,5 +25869,5 @@ #. 50000 #. -#. +#. #. #. @@ -25902,5 +25877,5 @@ #. 50000 #. -#. +#. #. #. @@ -25910,5 +25885,5 @@ #. 50000 #. -#. +#. #. #. @@ -25918,5 +25893,5 @@ #. 50000 #. -#. +#. #. #. @@ -25926,5 +25901,5 @@ #. 50000 #. -#. +#. #. #. @@ -25934,5 +25909,5 @@ #. 50000 #. -#. +#. #. #. @@ -25942,5 +25917,5 @@ #. 50000 #. -#. +#. #. #. @@ -25950,5 +25925,5 @@ #. 50000 #. -#. +#. #. #. @@ -25958,5 +25933,5 @@ #. 50000 #. -#. +#. #. #. @@ -25966,5 +25941,5 @@ #. 50000 #. -#. +#. #. #. @@ -25974,5 +25949,5 @@ #. 50000 #. -#. +#. #. #. @@ -25982,5 +25957,5 @@ #. 50000 #. -#. +#. #. #. @@ -25990,5 +25965,5 @@ #. 50000 #. -#. +#. #. #. @@ -25998,5 +25973,5 @@ #. 50000 #. -#. +#. #. #. @@ -26006,5 +25981,5 @@ #. 50000 #. -#. +#. #. #. @@ -26014,5 +25989,5 @@ #. 50000 #. -#. +#. #. #. @@ -26022,5 +25997,5 @@ #. 50000 #. -#. +#. #. #. @@ -26030,5 +26005,5 @@ #. 50000 #. -#. +#. #. #. @@ -26038,5 +26013,5 @@ #. 50000 #. -#. +#. #. #. @@ -26046,5 +26021,5 @@ #. 50000 #. -#. +#. #. #. @@ -26054,5 +26029,5 @@ #. 50000 #. -#. +#. #. #. @@ -26062,5 +26037,5 @@ #. 50000 #. -#. +#. #. #. @@ -26070,5 +26045,5 @@ #. 50000 #. -#. +#. #. #. @@ -26104,7 +26079,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26114,5 +26089,5 @@ #. 50000 #. -#. +#. #. #. @@ -26122,5 +26097,5 @@ #. 50000 #. -#. +#. #. #. @@ -26130,5 +26105,5 @@ #. 50000 #. -#. +#. #. #. @@ -26138,5 +26113,5 @@ #. 50000 #. -#. +#. #. #. @@ -26146,5 +26121,5 @@ #. 50000 #. -#. +#. #. #. @@ -26154,5 +26129,5 @@ #. 50000 #. -#. +#. #. #. @@ -26162,5 +26137,5 @@ #. 50000 #. -#. +#. #. #. @@ -26177,5 +26152,5 @@ #. 50000 #. -#. +#. #. #. @@ -26185,5 +26160,5 @@ #. 50000 #. -#. +#. #. #. @@ -26193,5 +26168,5 @@ #. 50000 #. -#. +#. #. #. @@ -26201,5 +26176,5 @@ #. 50000 #. -#. +#. #. #. @@ -26209,5 +26184,5 @@ #. 50000 #. -#. +#. #. #. @@ -26217,5 +26192,5 @@ #. 50000 #. -#. +#. #. #. @@ -26226,5 +26201,5 @@ #. 50000 #. -#. +#. #. #. @@ -26234,5 +26209,5 @@ #. 50000 #. -#. +#. #. #. @@ -26242,5 +26217,5 @@ #. 40000 #. -#. +#. #. #. @@ -26250,5 +26225,5 @@ #. 50000 #. -#. +#. #. #. @@ -26257,5 +26232,5 @@ #. 40000 #. -#. +#. #. #. @@ -26264,5 +26239,5 @@ #. 40000 #. -#. +#. #. #. @@ -26280,7 +26255,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26290,5 +26265,5 @@ #. 50000 #. -#. +#. #. #. @@ -26298,5 +26273,5 @@ #. 50000 #. -#. +#. #. #. @@ -26306,5 +26281,5 @@ #. 50000 #. -#. +#. #. #. @@ -26314,5 +26289,5 @@ #. 50000 #. -#. +#. #. #. @@ -26322,5 +26297,5 @@ #. 50000 #. -#. +#. #. #. @@ -26330,5 +26305,5 @@ #. 50000 #. -#. +#. #. #. @@ -26338,5 +26313,5 @@ #. 50000 #. -#. +#. #. #. @@ -26346,5 +26321,5 @@ #. 50000 #. -#. +#. #. #. @@ -26354,5 +26329,5 @@ #. 50000 #. -#. +#. #. #. @@ -26371,5 +26346,5 @@ #. 50000 #. -#. +#. #. #. @@ -26383,5 +26358,5 @@ #. 50000 #. -#. +#. #. #. @@ -26395,5 +26370,5 @@ #. 50000 #. -#. +#. #. #. @@ -26403,5 +26378,5 @@ #. 50000 #. -#. +#. #. #. @@ -26415,5 +26390,5 @@ #. 50000 #. -#. +#. #. #. @@ -26427,5 +26402,5 @@ #. 50000 #. -#. +#. #. #. @@ -26439,6 +26414,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26448,5 +26423,5 @@ #. 50000 #. -#. +#. #. #. @@ -26460,5 +26435,5 @@ #. 50000 #. -#. +#. #. #. @@ -26472,5 +26447,5 @@ #. 50000 #. -#. +#. #. #. @@ -26484,5 +26459,5 @@ #. 50000 #. -#. +#. #. #. @@ -26496,5 +26471,5 @@ #. 50000 #. -#. +#. #. #. @@ -26508,5 +26483,5 @@ #. 50000 #. -#. +#. #. #. @@ -26516,7 +26491,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26526,5 +26501,5 @@ #. 50000 #. -#. +#. #. #. @@ -26534,5 +26509,5 @@ #. 50000 #. -#. +#. #. #. @@ -26542,5 +26517,5 @@ #. 50000 #. -#. +#. #. #. @@ -26550,5 +26525,5 @@ #. 50000 #. -#. +#. #. #. @@ -26565,5 +26540,5 @@ #. 50000 #. -#. +#. #. #. @@ -26576,5 +26551,5 @@ #. 50000 #. -#. +#. #. #. @@ -26588,5 +26563,5 @@ #. 50000 #. -#. +#. #. #. @@ -26600,5 +26575,5 @@ #. 50000 #. -#. +#. #. #. @@ -26612,5 +26587,5 @@ #. 50000 #. -#. +#. #. #. @@ -26621,5 +26596,5 @@ #. 50000 #. -#. +#. #. #. @@ -26629,5 +26604,5 @@ #. 50000 #. -#. +#. #. #. @@ -26637,5 +26612,5 @@ #. 50000 #. -#. +#. #. #. @@ -26645,5 +26620,5 @@ #. 50000 #. -#. +#. #. #. @@ -26653,5 +26628,5 @@ #. 50000 #. -#. +#. #. #. @@ -26668,5 +26643,5 @@ #. 50000 #. -#. +#. #. #. @@ -26680,5 +26655,5 @@ #. 50000 #. -#. +#. #. #. @@ -26692,5 +26667,5 @@ #. 50000 #. -#. +#. #. #. @@ -26704,5 +26679,5 @@ #. 50000 #. -#. +#. #. #. @@ -26716,5 +26691,5 @@ #. 50000 #. -#. +#. #. #. @@ -26728,5 +26703,5 @@ #. 50000 #. -#. +#. #. #. @@ -26735,7 +26710,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26745,5 +26720,5 @@ #. 50000 #. -#. +#. #. #. @@ -26753,5 +26728,5 @@ #. 50000 #. -#. +#. #. #. @@ -26761,5 +26736,5 @@ #. 50000 #. -#. +#. #. #. @@ -26769,5 +26744,5 @@ #. 50000 #. -#. +#. #. #. @@ -26777,5 +26752,5 @@ #. 50000 #. -#. +#. #. #. @@ -26785,5 +26760,5 @@ #. 50000 #. -#. +#. #. #. @@ -26793,5 +26768,5 @@ #. 50000 #. -#. +#. #. #. @@ -26808,7 +26783,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26818,5 +26793,5 @@ #. 50000 #. -#. +#. #. #. @@ -26826,5 +26801,5 @@ #. 50000 #. -#. +#. #. #. @@ -26834,5 +26809,5 @@ #. 50000 #. -#. +#. #. #. @@ -26842,5 +26817,5 @@ #. 50000 #. -#. +#. #. #. @@ -26856,5 +26831,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26903,5 +26878,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26911,5 +26886,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26919,5 +26894,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26927,5 +26902,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26935,5 +26910,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26943,5 +26918,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26951,5 +26926,5 @@ #. 50000 #. -#. +#. #. #. @@ -26959,5 +26934,5 @@ #. 50000 #. -#. +#. #. #. @@ -26967,5 +26942,5 @@ #. 50000 #. -#. +#. #. #. @@ -26975,5 +26950,5 @@ #. 50000 #. -#. +#. #. #. @@ -26983,5 +26958,5 @@ #. 50000 #. -#. +#. #. #. @@ -26991,5 +26966,5 @@ #. 50000 #. -#. +#. #. #. @@ -27009,5 +26984,5 @@ #. 50000 #. -#. +#. #. #. @@ -27016,5 +26991,5 @@ #. 50000 #. -#. +#. #. #. @@ -27023,5 +26998,5 @@ #. 50000 #. -#. +#. #. #. @@ -27030,5 +27005,5 @@ #. 40000 #. -#. +#. #. #. @@ -27037,5 +27012,5 @@ #. 40000 #. -#. +#. #. #. @@ -27044,5 +27019,5 @@ #. 40000 #. -#. +#. #. #. @@ -27137,5 +27112,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -27143,28 +27118,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 @@ -27279,5 +27254,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27290,5 +27265,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27313,6 +27288,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27321,6 +27296,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27335,6 +27310,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 @@ -27348,6 +27323,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 @@ -27367,6 +27342,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27390,6 +27365,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 @@ -27402,4 +27377,87 @@ msgstr "" +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Kan ikke gjøre om kommando \"{0}\" fordi lag \"{1}\" ikke lenger er " +#~ "tilgjengelig" + +#~ msgid "Images for {0}" +#~ msgstr "Bilder for {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Les GPX …" + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Ingen tid gitt for punkt {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Ingen bilder med lesbare tidsstempler funnet" + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS start: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS-slutt: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "nåværende forskjell: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "tidssone-forskjell: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} innenfor sporet." + +#~ msgid "Sync clock" +#~ msgstr "Synkronisér klokke" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Klarte ikke tolke datoen i fila «{0}»." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»." + +#~ msgid "Image" +#~ msgstr "Bilde" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "GPS-enhetens tidssone (forskjell fra foto)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synkronisér tidspunkt med GPS-enhet" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Den indtastede tid kunne ikke tolkes" + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ – Geotaggede bilder" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Åpne bilder med AgPifoJ …" + +#~ msgid "osmarender options" +#~ msgstr "osmarender-indstillinger" + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Et annet geotag programtillegg for JOSM. Kobler bilder med GPS spor eller " +#~ "importerer bilder med koordinater i EXIF." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Flere verktøy som kan gjøre livet enklere. Eksempel: forenkle linje, Slå " +#~ "sammen areal, gå til posisjon." + #~ msgid "Move" #~ msgstr "Flytt" @@ -27423,11 +27481,10 @@ #~ msgstr "JOSM hjelpesider" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Feil ved nedlasting av {0}" #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" #~ "De valgte nodene er medlemmer i forskjellige relasjoner. Vil du fremdeles " @@ -27447,8 +27504,9 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" -#~ "Feilmelding: cannot check conditions for no layer. Send inn en feilmelding." +#~ "Feilmelding: cannot check conditions for no layer. Send inn en " +#~ "feilmelding." #~ msgid "No document open so nothing to save." @@ -27465,9 +27523,9 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" #~ "Ingen data å oppdatere. Har du allerede åpnet eller lastet dette ned?" -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -27478,12 +27536,7 @@ #~ msgstr "Ingenting er importert." -#, java-format #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "{0} konflikter må løses i {1} objecter" -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Slett {1} {0}" - #~ msgid "Conflicting relation" #~ msgstr "Relasjonen har konflikter" @@ -27513,5 +27566,4 @@ #~ msgstr "rett versjon" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27538,17 +27590,16 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" -#~ "Tilbakestill status på alle valgte objekt til versjon som valgt i historikk." +#~ "Tilbakestill status på alle valgte objekt til versjon som valgt i " +#~ "historikk." #~ msgid "Date" #~ msgstr "Dato" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Konflikter: {0}" -#, java-format #~ msgid "Layers: {0}" #~ msgstr "Lag: {0}" @@ -27581,9 +27632,7 @@ #~ msgstr "Flytt ned" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Relasjons-editor: {0}" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Opphavsmenn: {0}" @@ -27592,7 +27641,4 @@ #~ msgstr "Vis Opphavsmenn Panel" -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Tast inn først de ønskede koordinater." - #~ msgid "Select a bookmark first." #~ msgstr "Velg først et bokmerke" @@ -27621,11 +27667,11 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" #~ "ADVARSEL: Passordet er lagret i vanlig tekst (IKKE KRYPTERT) i " -#~ "konfigurasjons filen.
Passordet er overført i vanlig tekst til serveren, " -#~ "satt inn i web adressen.
Ikke bruk et viktig passord da andre kan lese " -#~ "det." +#~ "konfigurasjons filen.
Passordet er overført i vanlig tekst til " +#~ "serveren, satt inn i web adressen.
Ikke bruk et viktig passord da " +#~ "andre kan lese det." #~ msgid "Unknown version" @@ -27672,5 +27718,4 @@ #~ msgstr "Fandt -element i en ikke-relation." -#, java-format #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." @@ -27678,15 +27723,14 @@ #~ msgstr[1] "{0} Programtillegg oppdatert. Restart JOSM." -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" -#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned automatisk." - -#, java-format +#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned " +#~ "automatisk." + #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Programtillegget krever oppdatering {0} av JOSM." -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Kunne ikke laste programtillegg: {0} fra {1}" @@ -27696,6 +27740,6 @@ #~ "setting the config option 'pluginmanager.warntime'.)" #~ msgstr "" -#~ "(Du kan endre antall dager mellom advarslene
ved å endre denne verdien i " -#~ "oppstettet 'pluginmanager.warntime'.)" +#~ "(Du kan endre antall dager mellom advarslene
ved å endre denne verdien " +#~ "i oppstettet 'pluginmanager.warntime'.)" #~ msgid "" @@ -27703,10 +27747,10 @@ #~ "about the problem." #~ msgstr "" -#~ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM utviklerne." +#~ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM " +#~ "utviklerne." #~ msgid "Plugin already exists" #~ msgstr "Programtillegg finnes allerede" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Venligst send en feilrapport på {0}" @@ -27721,5 +27765,4 @@ #~ msgstr "Husk å inkludere følgende informasjon:" -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -27728,16 +27771,12 @@ #~ "{0}" #~ msgstr "" -#~ "Programtillegg lista er allerede tilgengelig. Vil du laste ned ny versjon " -#~ "over den eksisterende?\n" +#~ "Programtillegg lista er allerede tilgengelig. Vil du laste ned ny " +#~ "versjon over den eksisterende?\n" #~ "\n" #~ "{0}" -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Feil ved sletting av programtillegg: {0}" - #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" #~ "Prøv å oppdatere til siste versjon av JOSM og alle programtillegg før du " @@ -27750,6 +27789,6 @@ #~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You can " -#~ "adjust the sliders to manually match the photos." +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." #~ msgstr "" #~ "Feil ved kobling av foto til GPX spor. Still inn rullefeltet for manuell " @@ -27765,5 +27804,4 @@ #~ msgstr "Lambert Zone 4 cache file (.4)" -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "Bytt til kartprojeksjonen {0}." @@ -27787,6 +27825,6 @@ #~ msgstr "Åpne vindu med OpenStreetBugs og aktiviser automatisk nedlasting" -#, java-format -#~ msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" #~ msgstr "" #~ "Lambert sone {0} i mellomlager stemmer ikke med aktiv Lambert sone {1}" @@ -27795,5 +27833,4 @@ #~ msgstr "Be op Oppdatering" -#, java-format #~ msgid "requested: {0}" #~ msgstr "bestilt: {0}" @@ -27856,11 +27893,10 @@ #~ msgstr "Hjelp / Om" -#, java-format #~ msgid "rectifier id={0}" #~ msgstr "rectifier id={0}" #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -27877,6 +27913,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example,replacing 73 with your image id: \n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -27885,6 +27921,6 @@ #~ "use." #~ msgstr "" -#~ "Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger - " -#~ "disse vil vises i WMS menyen.\n" +#~ "Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger " +#~ "- disse vil vises i WMS menyen.\n" #~ "Kan også settes manuelt i Avanserte innstillinger, etter følgende mal:\n" #~ "wmsplugin.url.1.name=Landsat\n" @@ -27897,16 +27933,17 @@ #~ "format=image/jpeg \n" #~ "\n" -#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , må du " -#~ "bare oppgi gyldig 'id'.\n" -#~ "Å legge inn Metacarta Map Rectifier menyer, lag en URL manuelt som i dette " -#~ "eksempelet. Bytt ut 73 med din bilde id: \n" +#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , må " +#~ "du bare oppgi gyldig 'id'.\n" +#~ "Å legge inn Metacarta Map Rectifier menyer, lag en URL manuelt som i " +#~ "dette eksempelet. Bytt ut 73 med din bilde id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" #~ " \n" -#~ "OBS: Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i tvil: " -#~ "la være å bruke bildet." +#~ "OBS: Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i " +#~ "tvil: la være å bruke bildet." #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS" +#~ msgstr "" +#~ "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS" #~ msgid "Please select the row to copy." @@ -27915,6 +27952,6 @@ #~ msgid "" #~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to OSM " -#~ "eg. deleting uninteresting parts of track." +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." #~ msgstr "" #~ "Programtilleggets hovedfunksjon er sletting av punkt i GPX sporfil. " @@ -27932,6 +27969,6 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?" @@ -27955,5 +27992,4 @@ #~ msgstr "Splitt linje i segment" -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Ignorerer en linje fordi den har en node som ikke eksisterer: {0}\n" @@ -27980,5 +28016,4 @@ #~ msgstr "infotavle" -#, java-format #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart." @@ -28011,5 +28046,4 @@ #~ msgstr "Datalag" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Kan ikke åpne innstillingsmappe: {0}" @@ -28049,5 +28083,4 @@ #~ msgstr "Fant ikke fila" -#, java-format #~ msgid "" #~ "WARNING: launching browser windows for the first {0} of {1} selected " @@ -28080,5 +28113,4 @@ #~ msgstr "Rydder ut 1 objekt" -#, java-format #~ msgid "removing reference from way {0}" #~ msgstr "fjerner henvisning fra vei {0}" @@ -28115,10 +28147,10 @@ #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." #~ msgstr "" -#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for hjelp." +#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se http://" +#~ "josm.openstreetmap.de/wiki/TaggingPresets for hjelp." #~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to selected " -#~ "user, opens browser showing selected author profile page." +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." #~ msgstr "" #~ "Verktøy for å redigere opphavspersoner/brukere. Velger kartdata fra valgt " @@ -28140,5 +28172,4 @@ #~ msgstr "Yahoo (WebKit GTK)" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28154,5 +28185,4 @@ #~ "Ikke last opp data etter denne beskjeden." -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28170,17 +28200,13 @@ #~ "Ikke last opp data etter denne meldingen." -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Bruk objektmal «{0}» i gruppe «{1}»" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Bruk objektmal «{0}»" -#, java-format #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" #~ msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" -#, java-format #~ msgid "" #~ "Uploading failed because a primitive you tried " @@ -28189,6 +28215,6 @@ #~ msgstr "" #~ "Opplasting feilet fordi et element du prøvde " -#~ "å
slette allerede er slettet på " -#~ "tjeneren.

Feilmelding:
{0}" +#~ "å
slette allerede er slettet på tjeneren.

Feilmelding:
{0}" #~ msgid "parameter '{0}' must not be null" @@ -28198,5 +28224,4 @@ #~ msgstr "Bruk ufullstendige løsninger" -#, java-format #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." #~ msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}." @@ -28215,6 +28240,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -28230,6 +28255,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example, replacing 73 with your image id:\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28241,6 +28266,6 @@ #~ "und löschen - Diese werden dann im WMS-Menü angezeigt. \n" #~ "\n" -#~ "Sie können dies in den erweiterten Einstellungen auch manuell nach folgendem " -#~ "Schema erledigen:\n" +#~ "Sie können dies in den erweiterten Einstellungen auch manuell nach " +#~ "folgendem Schema erledigen:\n" #~ "wmsplugin.url.1.name=LandSat\n" #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" @@ -28259,18 +28284,13 @@ #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" #~ "\n" -#~ "Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht unbedenklich " -#~ "sind. Im Zweifel verzichten Sie auf die Nutzung." - -#, java-format +#~ "Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht " +#~ "unbedenklich sind. Im Zweifel verzichten Sie auf die Nutzung." + #~ msgid "Layer {0} must be in list of layers" #~ msgstr "Lag {0} må være i listen over lag" -#~ msgid "Sort" -#~ msgstr "Sorter" - #~ msgid "No data" #~ msgstr "Ingen data" -#, java-format #~ msgid "Remove relation member {0} {1}" #~ msgstr "Fjern relasjonsmedlem {0} {1}" @@ -28282,12 +28302,10 @@ #~ msgstr "feil ved fårespørsel om oppdatering: ikke zoom-nivå 12" -#, java-format #~ msgid "Help page missing. Create it in English." #~ msgstr "Hjelpeside mangler. Opprett den på engelsk." -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" #~ "Hjelpeside mangler. Opprett den på engelsk eller English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" -#~ "Hjelp mangler. Kan lages i English ellerr norsk bokmål." - -#, java-format +#~ "Hjelp mangler. Kan lages i English ellerr norsk bokmål." + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "Uventet returverdi. Mottok {0}." @@ -28323,5 +28340,4 @@ #~ msgstr "Fant ingen siste versjon. Historikken er tom." -#, java-format #~ msgid "Index out of bounds. Got {0}." #~ msgstr "Indeks er utenfor rekkevidde: {0}" @@ -28330,5 +28346,4 @@ #~ msgstr "Vis historikken for det valgte objektet" -#, java-format #~ msgid "" #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." @@ -28336,7 +28351,7 @@ #~ "ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»" -#, java-format #~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''." +#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " +#~ "''{1}''." #~ msgstr "" #~ "ugyldig verdi for obligatorisk attributt «{0}» av type «int» (>= 0) – leste " Index: /applications/editors/josm/i18n/po/nl.po =================================================================== --- /applications/editors/josm/i18n/po/nl.po (revision 18974) +++ /applications/editors/josm/i18n/po/nl.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: Dutch \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:04+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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" @@ -116,5 +115,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 @@ -137,9 +136,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 @@ -155,20 +154,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 @@ -187,7 +182,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 "Fout" @@ -267,5 +262,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 "Plugins" @@ -312,4 +307,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 @@ -317,8 +314,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 @@ -328,29 +325,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 @@ -380,6 +375,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 "" @@ -431,14 +426,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 "Breedtegraad" #: ../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 "Lengtegraad" @@ -464,10 +459,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 @@ -498,19 +493,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 @@ -519,9 +517,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 @@ -537,7 +532,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 @@ -549,11 +544,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" @@ -641,5 +636,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}" @@ -694,10 +689,10 @@ "reeks van knopen)" -#: ../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} wegen combineren" -#: ../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 "Selecteer twee of meer wegen om te combineren." @@ -716,19 +711,19 @@ msgstr "Selecteer iets om te kopiëren" +#: ../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 "Cirkel aanmaken" -#: ../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 "Een cirkel uit drie knopen maken." -#: ../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 " @@ -741,9 +736,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 @@ -815,21 +810,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" @@ -837,6 +836,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 @@ -865,5 +864,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 "Dupliceren" @@ -920,8 +919,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 @@ -929,5 +926,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 @@ -940,8 +937,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 @@ -960,8 +957,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 @@ -984,13 +981,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 @@ -1030,4 +1028,106 @@ msgstr "Toon objectinformatie over OSM wegen, knopen of relaties." +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "Overlappende gebieden samenvoegen" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Joins areas that overlap each other" +msgstr "Overlappende gebieden samenvoegen" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +msgid "Only up to two areas can be joined at the moment." +msgstr "Op dit moment kunnen maximaal twee gebieden worden samengevoegd." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#, java-format +msgid "\"{0}\" is not closed and therefore can't be joined." +msgstr "\"{0}\" is niet gesloten en kan daarom niet worden samengevoegd." + +#: ../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 "" +"Knopen van de geselecteerde weg(gen) liggen buiten het gedownloade " +"gegevensgebied.\n" +"Hierdoor kunnen knopen onbedoeld gewist worden.\n" +"Weet je zeker dat je verder wilt gaan?" + +#: ../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 "Breek af als je het niet zeker weet" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 +msgid "Please select at least one closed way the should be joined." +msgstr "Selecteer minstens één gesloten weg die samengevoegd moet worden." + +#: ../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 "" +"Enkele wegen vormden onderdeel van relaties die zijn aangepast. Controleer " +"of er geen fouten zijn geïntroduceerd." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +msgid "Enter values for all conflicts." +msgstr "Waarden voor alle conflicten invoeren." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Conflicten oplossen" + +#: ../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 @@ -1047,4 +1147,48 @@ msgstr "Geen sneltoets" +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Jump To Position" +msgstr "Naar positie springen" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Opens a dialog that allows to jump to a specific location" +msgstr "" +"Een dialoogvenster openen waarmee naar een bepaalde locatie kan worden " +"gesprongen." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57 +msgid "Enter Lat/Lon to jump to position." +msgstr "Lat/lon invoeren om naar toe te springen." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 +msgid "You can also paste an URL from www.openstreetmap.org" +msgstr "Je kunt ook een URL van www.openstreetmap.org inplakken." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 +msgid "Zoom (in metres)" +msgstr "Zoom (in metres)" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 +msgid "URL" +msgstr "URL" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 +msgid "Jump there" +msgstr "Spring daarheen" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 +msgid "Jump to Position" +msgstr "Spring naar positie" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Could not parse Latitude, Longitude or Zoom. Please check." +msgstr "" +"Kan lengte- of breedtegraad of zoom niet ontleden. Controleer deze s.v.p." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Unable to parse Lon/Lat" +msgstr "Kan lat/lon niet ontleden." + #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" @@ -1055,26 +1199,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 "Knopen samenvoegen" -#: ../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 "Knopen in de oudste samenvoegen" -#: ../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 "Minstens twee knopen selecteren om samen te voegen." -#: ../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 "" @@ -1082,5 +1226,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" @@ -1455,6 +1599,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 "" "Statusrapport tonen met zinvolle informatie dat aan fouten geweten kan worden" @@ -1475,9 +1618,44 @@ #: ../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 "Sluiten" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Weg vereenvoudigen" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Ongebruikte knopen van een weg verwijderen." + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "Selecteer minimaal één weg om te vereenvoudigen." + +#: ../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] "" +"De selectie bevat {0} weg. Weet je zeker dat je deze wilt vereenvoudigen?" +msgstr[1] "" +"De selectie bevat {0} wegen. Weet je zeker dat je ze allemaal wilt " +"vereenvoudigen?" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 +msgid "Are you sure?" +msgstr "Weet je het zeker?" + +#: ../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] "Vereenvoudig weg (verwijder {0} knoop)" +msgstr[1] "Vereenvoudig weg (verwijder {0} knopen)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1549,6 +1727,6 @@ "this and correct it when necessary." msgstr "" -"Een relatie lidmaatschap is gekopieerd naar alle nieuwe " -"wegen.
Controleer dit en corrigeer dit waar nodig." +"Een relatie lidmaatschap is gekopieerd naar alle nieuwe wegen." +"
Controleer dit en corrigeer dit waar nodig." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 @@ -1609,6 +1787,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 "" "* een knoop die gebruikt is door meer dan één weg, en één van die wegen, of" @@ -1693,54 +1870,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 "Update selectie" +#: ../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 "Selectie leeg" -#: ../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 "Upload data" -#: ../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 "" @@ -1751,35 +1928,35 @@ "op te lossen" -#: ../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 "Geen aanpassingen aanwezig om te uploaden." -#: ../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 "Niets om te uploaden. Creëer eerst gegevens." -#: ../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 "Synchroniseer alleen relatie {0}" -#: ../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 "Synchroniseer alle gegevens" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1787,28 +1964,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 "Conflicten gedetecteerd" -#: ../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 "" @@ -1818,22 +1993,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 "" @@ -1844,15 +2019,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 "" @@ -1864,6 +2039,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 "" @@ -1872,38 +2047,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 "Upload selectie" -#: ../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 "" @@ -2067,6 +2241,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 "" @@ -2135,38 +2309,38 @@ msgstr "geselecteerd" -#: ../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 "Kan geen knoop buiten de wereld toevoegen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Knoop toevoegen" -#: ../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 "Knoop in weg toevoegen" -#: ../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 "Bestaande weg aan knoop koppelen" -#: ../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 "Een nieuwe knoop aan een bestaande weg toevoegen" -#: ../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 "Knoop in weg voegen en verbinden" -#: ../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 "Nieuwe node maken." -#: ../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 "Selecteer de node onder de cursor." -#: ../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." @@ -2175,14 +2349,14 @@ msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen." -#: ../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 "Start een nieuwe weg vanaf de node." -#: ../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 "Weg voortzetten vanaf laatste knoop." -#: ../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 "Tekenen beëindigen" @@ -2219,6 +2393,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 "" "Afspeelstart verslepen en loslaten nabij track om het geluid vanaf daar af " @@ -2321,5 +2495,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." @@ -2364,6 +2538,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Lange straat\" - 'Lange' en 'straat' in een sleutel of naam." +msgstr "\"Lange straat\" - 'Lange' en 'straat' in een sleutel of naam." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 @@ -2405,12 +2578,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "gebruiker:... - alle objecten veranderd door gebruiker" + +#: ../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 "nodes:... - object met opgegeven aantal knopen" -#: ../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-" @@ -2418,44 +2596,44 @@ 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 "modified - alle aangepaste objecten" -#: ../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 "selected - alle geselecteerde objecten" -#: ../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 "incomplete - alle incomplete objecten" -#: ../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 "ongetagd - alle objecten zonder tag" -#: ../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 "Gebruik | of OR om te combineren met een logische OR" -#: ../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 "" "Gebruik \" om operanten aan te halen (b.v. als sleutel \":\" bevat)" -#: ../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 "Gebruik ( en ) om expressies te groeperen" -#: ../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 @@ -2465,55 +2643,55 @@ msgstr "Filter" -#: ../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 "Zoeken" -#: ../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 "Start zoeken" -#: ../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 "Geen overeenkomst gevonden voor ''{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 "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid." -#: ../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 "Zoeken naar ''{0}'' heeft de selectie niet verkleind." -#: ../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} overeenkomsten gevonden" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2527,40 +2705,40 @@ "{2}" -#: ../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 "Onverwacht token: {0}" -#: ../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 "Ontbrekende argumenten voor OR." -#: ../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 "Ontbrekend argument voor NOT." -#: ../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 "Sluithaak verwacht." -#: ../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 "" @@ -2569,9 +2747,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 "" @@ -2580,5 +2758,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." @@ -2631,12 +2809,11 @@ #, 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 "" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2774,5 +2951,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 "Dubbel conflict" @@ -2791,5 +2968,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 "" @@ -2808,19 +2986,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" @@ -2829,5 +3007,5 @@ msgstr[1] "Verwijder {0} objecten" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2836,5 +3014,5 @@ msgstr[1] "Verwijder {0} knooppunten" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2843,5 +3021,5 @@ msgstr[1] "Verwijder {0} wegen" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2852,10 +3030,10 @@ #. 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?" +#: ../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 "" "Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt " @@ -2863,5 +3041,5 @@ "niet ziet) ze kunnen gebruiken.
Wil je ze echt verwijderen?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "" @@ -2879,15 +3057,15 @@ msgstr[1] "Verplaats {0} knooppunten" -#: ../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 "" @@ -2896,5 +3074,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}" @@ -2904,9 +3082,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 "" @@ -2986,5 +3159,5 @@ msgstr "Toepassen?" -#: ../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 " @@ -3130,6 +3303,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 "" @@ -3212,5 +3385,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3219,5 +3392,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3225,25 +3398,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 "Z" #. 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 "N" #. 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 "W" #. 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 "O" #: ../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 @@ -3266,25 +3439,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}" @@ -3292,6 +3466,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 "" @@ -3354,24 +3528,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 " @@ -3379,5 +3553,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 "" @@ -3409,6 +3583,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}." @@ -3429,5 +3603,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 @@ -3439,6 +3612,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 "" @@ -3449,135 +3621,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 "Oppervlak van weg is niet gesloten." -#: ../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 "Multipolygone weg \"{0}\" is niet gesloten." -#: ../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 "Lid \"{0}\" in relatie wissen." -#: ../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 "Weg \"{0}\" met minder dan twee punten." -#: ../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 "Meer dan een \"van\"-weg gevonden." -#: ../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 "Meer dan een \"naar\"-weg gevonden." -#: ../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 "Meer dan éé \"via\" gevonden." -#: ../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 "Onbekende rol \"{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 "Onbekend lidtype voor \"{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 "Geen \"van\"-weg gevonden." -#: ../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 "Geen \"naar\"-weg gevonden." -#: ../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 "Geen \"via\"-knoop of -weg gevonden." -#: ../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 "De \"van\"-weg begint of eindigt niet bij een \"via\"-knoop." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../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 "De \"naar\"-weg begint of eindigt niet bij een \"via\"-knoop/" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "De \"vanaf\"-weg begint of eindigt niet bij een \"via\"-weg." -#: ../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 "De \"naar\"-weg begint of eindigt niet bij een \"via\"-weg." -#: ../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 "Stijl voor beperking {0} is niet gevonden." -#: ../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 "Kruising tussen wegen \"{0}\" en \"{1}\"." -#: ../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 "Binnenweg \"{0}\" is uitwendig." -#: ../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 "Geen zinvolle rol \"{0}\" voor weg \"{1}\"." -#: ../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 "Niet-weg \"{0}\" in multipolygoon." -#: ../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 "Geen buitenweg voor multipolygoon \"{0}\"." -#: ../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 "Stijl voor binnenweg \"{0}\" komt overeen met multipolygoon." -#: ../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 "Stijl voor buitenweg \"{0}\" komt niet overeen." -#: ../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 "niet-getagd" -#: ../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 "tekst" -#: ../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 "Fout: {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}" @@ -3589,5 +3761,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 @@ -3606,5 +3778,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 @@ -3624,5 +3796,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 "achtergrond" @@ -3740,6 +3912,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 "" @@ -3754,5 +3925,5 @@ msgstr "Niet meer tonen" -#: ../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 @@ -3760,32 +3931,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 "onvolledig" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "snelweg" -#: ../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 "spoorweg" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "waterweg" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "grondgebruik" -#: ../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" @@ -3794,5 +3965,5 @@ msgstr[1] "{0} knopen" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -3900,6 +4071,6 @@ "filename" msgstr "" -"Alles downloaden. Mogelijkheden: x1,y1,x2,y2, een URL met lat=y&lon=x&zoom=z " -" of een bestandsnaam" +"Alles downloaden. Mogelijkheden: x1,y1,x2,y2, een URL met " +"lat=y&lon=x&zoom=z of een bestandsnaam" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 @@ -4045,12 +4216,12 @@ "gebruikt." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Bestand" -#: ../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 @@ -4064,19 +4235,19 @@ msgstr "Bewerken" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Beeld" -#: ../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 "Gereedschappen" -#: ../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 "Voorkeuze" -#: ../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 @@ -4087,5 +4258,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Geluid" @@ -4129,29 +4300,29 @@ msgstr "schalen" -#: ../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 "De geografische lengtegraad bij de cursor." -#: ../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 "De naam van het object bij de cursor." -#: ../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 "De geografische breedtegraad bij de cursor." -#: ../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 "De hoek tussen het vorige en het huidige wegsegment." -#: ../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 "De (kompas)richting van het lijnsegment dat wordt getekend." -#: ../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 "De lengte van het nieuwe wegsegment dat wordt getekend." -#: ../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 " @@ -4159,9 +4330,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(geen object)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "" @@ -4270,5 +4441,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" @@ -4277,5 +4448,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" @@ -4284,5 +4455,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" @@ -4301,5 +4472,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 @@ -4316,5 +4487,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" @@ -4386,22 +4557,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." @@ -4480,6 +4651,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 "" @@ -4548,6 +4718,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" @@ -4555,6 +4725,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" @@ -4611,6 +4781,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 "" @@ -4643,7 +4813,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 "" @@ -4789,5 +4959,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 "" @@ -4922,5 +5092,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 "" @@ -5020,7 +5190,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" @@ -5030,6 +5200,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" @@ -5063,7 +5233,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 "" @@ -5147,11 +5315,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 msgid "Open a list of all commands (undo buffer)." -msgstr "" -"Een lijst met alle mogelijk opdrachten openen (buffer ongedaan maken)." +msgstr "Een lijst met alle mogelijk opdrachten openen (buffer ongedaan maken)." #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 #: ../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 @@ -5220,10 +5387,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 "" @@ -5298,18 +5464,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 "Geschiedenis" -#: ../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 "De geschiedenis van alle geselecteerde items tonen." -#: ../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 @@ -5319,13 +5485,13 @@ msgstr "Herladen" -#: ../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 "Alle geselecteerde objecten herladen en de lijst verversen." -#: ../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 "" @@ -5518,5 +5684,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 "" @@ -5559,25 +5725,25 @@ msgstr "Op selectie inzoomen." -#: ../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 "Sel.: Rel.:{0} / Wegen:{1} / Knopen:{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 "Selectie" -#: ../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 "Selectie: {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 "Laat paneel drijven" -#: ../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." @@ -5586,5 +5752,5 @@ "werkbalk." -#: ../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 "Klik om de paneelinhoud te verkleinen/vergroten" @@ -5598,6 +5764,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 msgid "Open a list of people working on the selected objects." -msgstr "" -"Een lijst openen met mensen die aan de geselecteerde objecten werken." +msgstr "Een lijst openen met mensen die aan de geselecteerde objecten werken." #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 @@ -5645,37 +5810,37 @@ msgstr "# Objecten" -#: ../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 "Tegenstrijdigheden in de gegevens" -#: ../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 "" @@ -5684,63 +5849,91 @@ 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] "Alle incomplete wegen en daarbij behorende knopen downloaden" +msgstr[1] "Alle incomplete wegen en daarbij behorende knopen downloaden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Locatie downloaden" + +#: ../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 "Voorinstelling toepassen" + +#: ../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 "Een editor voor de geselecteerde relatie openen" + +#: ../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 "" @@ -5750,15 +5943,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 " @@ -5766,5 +5959,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 " @@ -5772,20 +5965,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 "" @@ -5794,66 +5987,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 "Sport" + +#: ../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 "De geselecteerde leden omhoog verplaatsen" #. 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 "De geselecteerde leden omlaag verplaatsen" #. 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 " @@ -5862,53 +6059,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 "Alle incomplete wegen en daarbij behorende knopen downloaden" -#: ../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 "Leden downloaden" -#: ../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 "" @@ -5918,41 +6121,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 "" @@ -5992,19 +6188,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 "Wijzigingen toepassen" -#: ../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}''" @@ -6016,6 +6212,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 "" @@ -6174,6 +6369,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218 msgid "Download area too large; will probably be rejected by server" -msgstr "" -"Gebied te groot om te downloaden; server zal waarschijnlijk weigeren." +msgstr "Gebied te groot om te downloaden; server zal waarschijnlijk weigeren." #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:221 @@ -6198,7 +6392,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 "" @@ -6971,5 +7164,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 @@ -7206,6 +7399,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 "" @@ -7215,6 +7408,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 "" @@ -7477,13 +7670,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}" @@ -7584,6 +7777,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 "" @@ -7668,6 +7860,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] "" @@ -7681,6 +7873,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 " @@ -7735,5 +7927,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 " @@ -7741,5 +7933,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 "" @@ -7812,40 +8004,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 "Objecten om toe te voegen:" -#: ../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 "Objecten om te bewerken:" -#: ../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 "Objecten om aan te verwijderen:" -#: ../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:" @@ -7854,5 +8046,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:" @@ -7861,5 +8053,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:" @@ -7868,68 +8060,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 "Aanpassingen uploaden" -#: ../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 "Voer eerst de gewenste coördinaten in." + +#: ../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 "Beschrijf kort de veranderingen die je upload:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../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}" @@ -7937,16 +8128,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}." @@ -7954,6 +8145,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 "" @@ -7962,5 +8153,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 "" @@ -7990,111 +8181,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Afbeeldingen van {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "GPX inlezen..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Geen tijd voor punt {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 "Kan tijd \"{0}\" van punt {1} x {2} niet lezen." - -#: ../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 "Lezen {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Geen afbeeldingen met een leesbare tijd gevonden." - -#: ../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 "Geotagged afbeeldingen" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "GPS-start: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "GPS-einde: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "Huidige verschil: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "Tijdzoneverschil: " - -#: ../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] "afbeelding" -msgstr[1] "afbeeldingen" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} binnen de track." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Klok synchroniseren" - -#: ../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 "JPEG-afbeeldingen (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Afbeelding" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Syncroniseer tijd met GPS-apparaat" - -#: ../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 "Ingevoerde tijd kon niet worden ontleed." - -#: ../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} meters" +msgstr[1] "{0} meters" + +#: ../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 "Voer een gebruikersnaam in" + +#: ../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 @@ -8102,30 +8237,30 @@ msgstr "GPS-punt" -#: ../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 "Lijntekening aanpassen" -#: ../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 "Algemene instellingen gebruiken." -#: ../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 "Lijnen tussen punten in deze laag tekenen." -#: ../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 "Geen lijnen tussen punten in deze laag tekenen." -#: ../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 "Lijntekenopties selecteren" -#: ../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 @@ -8133,5 +8268,5 @@ msgstr "Kleur aanpassen" -#: ../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 @@ -8140,5 +8275,5 @@ msgstr "Standaard" -#: ../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 @@ -8147,58 +8282,63 @@ msgstr "Kies een kleur" -#: ../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 "Markers van benoemde punten" -#: ../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 "Benoemde trackpunten van {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215 msgid "Import Audio" msgstr "Geluid importeren" -#: ../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 "Wave-geluidsbestanden (*.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 "Geluidsmarkers van {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 "Afbeeldingen importeren" -#: ../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 "JPEG-afbeeldingen (*.jpg)" + +#: ../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 "Naam: {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 @@ -8206,5 +8346,5 @@ msgstr "Beschrijving: {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" @@ -8214,5 +8354,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 @@ -8220,22 +8360,17 @@ msgstr "Beschrijving" -#: ../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 "URL" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443 msgid "Length: " msgstr "Lengte: " -#: ../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, " @@ -8244,5 +8379,5 @@ msgstr[1] "{0} routes, " -#: ../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" @@ -8251,24 +8386,24 @@ msgstr[1] "{0} waypoints" -#: ../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 "Naar gegevenslaag omzetten" -#: ../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:" +#: ../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 "" "Onverwerkte GPS-gegevens uploaden als kaartgegevens kan schadelijk " "zijn.
Als je sporen wilt uploaden, kijk dan hier:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8278,29 +8413,29 @@ msgstr "Omgezet van: {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 "Uit OSM langs deze track downloaden" -#: ../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 "Alles downloaden binnen:" -#: ../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} meters" -#: ../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 "Maximum oppervlak per verzoek:" -#: ../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} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8311,9 +8446,9 @@ "verder
gaan?" -#: ../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 "Geen GPX-track in laag beschikbaar om geluid mee te koppelen." -#: ../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 " @@ -8323,5 +8458,5 @@ "de track zijn overgeslagen of naar de start verplaatst." -#: ../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 " @@ -8331,23 +8466,23 @@ "kunnen schatten, zijn overgeslagen." -#: ../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 "Gegevenslaag {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 "buiten gedownload gebied" -#: ../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 "versie {0}" -#: ../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." @@ -8356,5 +8491,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 "" @@ -8368,5 +8503,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 "" @@ -8379,11 +8514,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" @@ -8392,32 +8527,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} bestaat uit:" -#: ../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 "API-versie: {0}" -#: ../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 "Naar GPX-laag omzetten" -#: ../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 "" @@ -8425,6 +8560,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 "" @@ -8463,4 +8598,358 @@ msgstr[1] "{0} punten" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "GPX-bestanden (*.gpx, *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "Bestand {0} is geladen met de naam \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#, java-format +msgid "Error while parsing {0}" +msgstr "Fout tijdens ontleden {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Kan \"{0}\" niet lezen" + +#: ../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 "" +"Maak een opname van je GPS-ontvanger met de tijd weergegeven.
Toon " +"deze foto hier.
Voer vervolgens de afgebeelde tijd hier in en selecteer " +"een tijdzone
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Fototijd (uit exif):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "GPS-tijd (lees uit de bovenstaande foto): " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [dd/mm/yyyy hh:mm:ss]" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +msgid "I'm in the timezone of: " +msgstr "Ik bevind mij in tijdzone: " + +#: ../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 "Geen datum" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "Open een andere foto" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +msgid "Synchronize time from a photo of the GPS receiver" +msgstr "De tijd met een foto van de GPS-ontvanger synchroniseren" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"Het ontleden van de datum is mislukt.\n" +"Gebruik de verwachte indeling a.u.b." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "Ongeldige datum" + +#: ../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 "GPX-track: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Een ander GPX-spoor openene" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +msgid "Timezone: " +msgstr "Tijdzone: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +msgid "Offset:" +msgstr "Verschuiving:" + +#: ../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 "" +"Ik kan een foto van mijn GPS-ontvanger maken.
Zou dat helpen?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 +msgid "Update position for: " +msgstr "Locatie bijwerken van: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 +msgid "All images" +msgstr "Alle afbeeldingen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 +msgid "Images with no exif position" +msgstr "Afbeelding zonder EXIF-locatie" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 +msgid "Not yet tagged images" +msgstr "Nog niet getagde afbeeldingen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +msgid "Correlate images with GPX track" +msgstr "Verband tussen afbeeldingen en GPX-tracks leggen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Correlate" +msgstr "Correleer" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Auto-Guess" +msgstr "Automatisch schatten" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +msgid "You should select a GPX track" +msgstr "U mag een GPX-track selecteren" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "Geen GPX-tracks geselecteerd" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Ontleden van tijdzone is mislukt.\n" +"Verwachte indeling: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +msgid "Invalid timezone" +msgstr "Ongeldige tijdzone" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Ontleden van verschuiving is mislukt.\n" +"Verwachte indeling: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +msgid "Invalid offset" +msgstr "Ongeldige verschuiving" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "{0} overeenkomsten van {1} gevonden in GPX-track {2}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "GPX-track geladen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 +msgid "The selected photos don't contain time information." +msgstr "De selecteerde foto's bevatten geen tijdinformatie." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 +msgid "Photos don't contain time information" +msgstr "Foto's bevatten geen tijdinformatie." + +#: ../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 "" +"De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "GPX-track heeft geen tijdinformatie" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "Tijdzone: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "Minuten: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "Seconden: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "{0} van de {1} foto's komen overeen met GPX-track." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "(Tijdverschil van {0} dagen)" + +#: ../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 "Koppelen van foto's aan track is mislukt" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +msgid "Adjust timezone and offset" +msgstr "Tijdzone en tijdverschil aanpassen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +msgid "Default Values" +msgstr "Standaardwaarden" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +msgid "Extracting GPS locations from EXIF" +msgstr "GPS-locaties uit EXIF halen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +msgid "Starting directory scan" +msgstr "Mappenscan starten" + +#: ../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 "Foto's lezen..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "Lezen {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 "Kan geen canoniek pad voor map {0} krijgen\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "Map {0} scannen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "Leeg bestand in {0} gevonden\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Bestanden uit map {0} halen is mislukt\n" + +#: ../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 "Geotagged afbeeldingen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "Met GPX relateren" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "afbeelding" +msgstr[1] "afbeeldingen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "{0} zijn getagd als GPS" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +msgid "No image" +msgstr "Geen afbeelding" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "{0} laden" + +#: ../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 "Bestand {0} gaat fout" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Toon geogetagde foto's" + +#: ../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 "Vorige" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Foto uit laag verwijderen" + +#: ../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 "Volgende" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "Beeld centreren" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +msgid "Zoom best fit and 1:1" +msgstr "Zoom optimaal en 1:1" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#, java-format +msgid "" +"\n" +"Altitude: {0} m" +msgstr "" +"\n" +"Hoogte: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8522,6 +9011,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." -msgstr "" -"Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen." +msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen." #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171 @@ -8643,6 +9131,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43 msgid "Start of track (will always do this if no other markers available)." -msgstr "" -"Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)." +msgstr "Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53 @@ -8783,5 +9270,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 @@ -8817,6 +9304,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Dilution of Position (red = high, green = low, if available)" -msgstr "" -"Afwijking van locatie (rood = hoog, groen = laag, indien beschikbaar)" +msgstr "Afwijking van locatie (rood = hoog, groen = laag, indien beschikbaar)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 @@ -8978,6 +9464,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 "" "De richtingspijlen tekenen door te zoeken in tabellen i.p.v. ingewikkelde " @@ -9044,6 +9529,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 "" "Anti-aliasing op het kaartbeeld toepassen, met een vloeiender uiterlijk als " @@ -9115,19 +9599,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 "Weergave en Vormgeving" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Taal" + +#: ../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 "Standaard (automatisch bepaald)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Taal" - -#: ../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 @@ -9230,6 +9714,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108 msgid "You have to restart JOSM for some settings to take effect." -msgstr "" -"U dient JOSM opnieuw te starten om sommige instellingen te activeren." +msgstr "U dient JOSM opnieuw te starten om sommige instellingen te activeren." #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 @@ -9256,6 +9739,5 @@ #, java-format msgid "The projection {0} could not be activated. Using Mercator" -msgstr "" -"De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt" +msgstr "De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35 @@ -9389,6 +9871,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 "" @@ -9454,6 +9936,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 "" "

Daarnaast worden de sneltoetsen geactiveerd als de opdrachten voor de " @@ -9471,9 +9953,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 "" "

Het kan je opgevallen zijn dat de toetsenselectielijst op de volgende " @@ -9486,6 +9967,6 @@ "':'). Gebruik deze ook niet, maar in plaats daarvan de basistoets (';' op US-" "toetsenborden, '.' op Duitse toetsenborden, enz.). Als je deze regels " -"overtreedt kunnen er conflicten ontstaan omdat JOSM niet kan weten dat " -"CTRL+SHIFT+; en CTRL+: op een US-toetsenbord eigenlijk hetzelfde is...

" +"overtreedt kunnen er conflicten ontstaan omdat JOSM niet kan weten dat CTRL" +"+SHIFT+; en CTRL+: op een US-toetsenbord eigenlijk hetzelfde is...

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177 @@ -9513,6 +9994,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 "" "

De pseudo-aanpasser 'uitgeschakeld' zal de sneltoets uitschakelen als het " @@ -9607,5 +10088,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 "Meer informatie over deze functionaliteit" @@ -9692,5 +10173,5 @@ msgstr "Downloaden van punten {0} tot {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 @@ -9698,5 +10179,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9818,14 +10299,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 @@ -9853,24 +10333,31 @@ 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] "Downloaden van punten {0} tot {1}..." +msgstr[1] "Downloaden van punten {0} tot {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9912,27 +10399,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 "" @@ -9940,66 +10427,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 "Changeset sluiten" -#: ../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 "Voorbereiden…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Uploaden..." -#: ../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}." @@ -10034,5 +10521,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}''." @@ -10059,5 +10546,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}." @@ -10065,5 +10552,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}" @@ -10076,5 +10563,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}''." @@ -10133,7 +10620,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 "" @@ -10161,6 +10648,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 "" @@ -10226,46 +10713,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 "" @@ -10273,19 +10759,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 "Incomplete -specificatie met ref=0" -#: ../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 "Ongeldig object met 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 "" @@ -10295,8 +10781,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 "" @@ -10306,25 +10792,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 "" @@ -10332,5 +10818,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10339,5 +10825,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10345,5 +10831,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10352,13 +10838,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 "OSM-gegevens voorbereiden..." -#: ../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 "" @@ -10411,4 +10897,10 @@ msgid "Contacting Server..." msgstr "Met server verbinden..." + +#: ../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 @@ -10447,42 +10939,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 "" @@ -10524,17 +11017,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} verwijderen" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Fout tijdens verwijderen plugin-bestand: {0}" + +#: ../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}." @@ -10546,19 +11049,18 @@ msgstr "Een fout opgetreden in plugin {0}" -#: ../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" @@ -10567,50 +11069,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 "Laatste plugin-update is meer dan {0} dagen geleden." -#: ../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 "Plugin {1} heeft plugin {0} nodig, maar deze is niet aangetroffen." -#: ../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 "Plugin niet gevonden: {0}" -#: ../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 "Laden van plugin {0} is mislukt. Deze uit de voorkeuren verwijderen?" -#: ../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 "Plugin uitschakelen" -#: ../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 " @@ -10620,22 +11122,22 @@ "rechten heeft om de bestaande plugins te overschrijven." -#: ../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 "" "An unexpected exception occurred that may have come from the ''{0}'' plugin." msgstr "" -"Een onverwachte uitzondering is opgetreden, mogelijk afkomstig van de " -"\"{0}\"-plugin." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318 +"Een onverwachte uitzondering is opgetreden, mogelijk afkomstig van de \"{0}" +"\"-plugin." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:319 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Volgens de informatie in de plugin, is de auteur {0}." -#: ../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." @@ -10644,9 +11146,9 @@ "fout rapporteert." -#: ../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 "Moet de plugin worden uitgeschakeld?" -#: ../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 " @@ -10656,13 +11158,13 @@ "uit de applicatie te halen." -#: ../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" @@ -10781,6 +11283,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 "" @@ -10818,6 +11320,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 "" @@ -10879,7 +11381,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 "" @@ -10891,7 +11392,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 "" @@ -10923,6 +11424,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 "" @@ -11180,5 +11681,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" @@ -11193,12 +11694,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 "Oneven" -#: ../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 @@ -11206,456 +11705,144 @@ msgstr "Even" -#: ../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 "Nummer" + +#. 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 "Natuurlijk" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "afbeelding" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Verhuur" + +#: ../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 "binnensegment" + +#: ../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 "AgPifoJ - Geotagged-afbeeldingen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "Toon geogetagde foto's" - -#: ../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 "Vorige" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Foto uit laag verwijderen" - -#: ../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 "Volgende" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "Beeld centreren" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102 -msgid "Zoom best fit and 1:1" -msgstr "Zoom optimaal en 1:1" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 -#, java-format -msgid "" -"\n" -"Altitude: {0} m" -msgstr "" -"\n" -"Hoogte: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/h" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "GPS-locaties uit EXIF halen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121 -msgid "Starting directory scan" -msgstr "Mappenscan starten" - -#: ../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 "Foto's lezen..." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:186 -#, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "Kan geen canoniek pad voor map {0} krijgen\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "Map {0} scannen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "Leeg bestand in {0} gevonden\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Bestanden uit map {0} halen is mislukt\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "Met GPX relateren" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} zijn getagd als GPS" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "Afbeeldingen openen met AGPifoJ..." - -#: ../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 "Verzameling afbeeldingen laden als een nieuwe laag." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "GPX-bestanden (*.gpx, *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "Bestand {0} is geladen met de naam \"{1}\"" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#, java-format -msgid "Error while parsing {0}" -msgstr "Fout tijdens ontleden {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Kan \"{0}\" niet lezen" - -#: ../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 "" -"Maak een opname van je GPS-ontvanger met de tijd weergegeven.
Toon " -"deze foto hier.
Voer vervolgens de afgebeelde tijd hier in en selecteer " -"een tijdzone
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Fototijd (uit exif):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "GPS-tijd (lees uit de bovenstaande foto): " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [dd/mm/yyyy hh:mm:ss]" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 -msgid "I'm in the timezone of: " -msgstr "Ik bevind mij in tijdzone: " - -#: ../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 "Geen datum" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "Open een andere foto" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 -msgid "Synchronize time from a photo of the GPS receiver" -msgstr "De tijd met een foto van de GPS-ontvanger synchroniseren" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"Het ontleden van de datum is mislukt.\n" -"Gebruik de verwachte indeling a.u.b." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "Ongeldige datum" - -#: ../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 "GPX-track: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Een ander GPX-spoor openene" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -msgid "Timezone: " -msgstr "Tijdzone: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 -msgid "Offset:" -msgstr "Verschuiving:" - -#: ../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 "" -"Ik kan een foto van mijn GPS-ontvanger maken.
Zou dat helpen?" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Locatie bijwerken van: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Alle afbeeldingen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Afbeelding zonder EXIF-locatie" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Nog niet getagde afbeeldingen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 -msgid "Correlate images with GPX track" -msgstr "Verband tussen afbeeldingen en GPX-tracks leggen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Correlate" -msgstr "Correleer" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Automatisch schatten" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "U mag een GPX-track selecteren" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Geen GPX-tracks geselecteerd" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Ontleden van tijdzone is mislukt.\n" -"Verwachte indeling: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Ongeldige tijdzone" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Ontleden van verschuiving is mislukt.\n" -"Verwachte indeling: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Ongeldige verschuiving" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "{0} overeenkomsten van {1} gevonden in GPX-track {2}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX-track geladen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "De selecteerde foto's bevatten geen tijdinformatie." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Foto's bevatten geen tijdinformatie." - -#: ../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 "" -"De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX-track heeft geen tijdinformatie" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Tijdzone: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minuten: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Seconden: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "{0} van de {1} foto's komen overeen met GPX-track." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Tijdverschil van {0} dagen)" - -#: ../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 "Koppelen van foto's aan track is mislukt" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Tijdzone en tijdverschil aanpassen" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Standaardwaarden" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433 -msgid "No image" -msgstr "Geen afbeelding" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "{0} laden" - -#: ../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 "Bestand {0} gaat fout" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11770,6 +11957,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Replace original background by JOSM background color." -msgstr "" -"Oorspronkelijke achtergrond vervangen door achtergrondkleur van JOSM." +msgstr "Oorspronkelijke achtergrond vervangen door achtergrondkleur van JOSM." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 @@ -11800,11 +11986,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 "" @@ -12126,12 +12311,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] "Vereenvoudig weg (verwijder {0} knoop)" -msgstr[1] "Vereenvoudig weg (verwijder {0} knopen)" - #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 @@ -12247,14 +12424,14 @@ msgstr "Kleurenschema's" -#: ../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 " @@ -12464,6 +12641,6 @@ msgstr "" "Kan bibliotheek rxtxSerial niet laden. Als je ondersteuning bij het " -"installeren nodig hebt, kijk dan op Globalsat: http://www.raphael-" -"mack.de/josm-globalsat-gpx-import-plugin/" +"installeren nodig hebt, kijk dan op Globalsat: http://www.raphael-mack.de/" +"josm-globalsat-gpx-import-plugin/" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 @@ -12565,4 +12742,8 @@ msgstr "Afbeeldingen met ImageWayPoint openen" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Verzameling afbeeldingen laden als een nieuwe laag." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -12606,18 +12787,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 "Knooppunten reductie uitvoeren..." -#: ../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 "Douglas-Peuckerbenadering uitvoeren..." -#: ../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 "Dubbele knopen verwijderen..." -#: ../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" @@ -12666,7 +12847,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12676,5 +12857,5 @@ #. 50000 #. -#. +#. #. #. @@ -12684,5 +12865,5 @@ #. 50000 #. -#. +#. #. #. @@ -12691,5 +12872,5 @@ #. 50000 #. -#. +#. #. #. @@ -12699,5 +12880,5 @@ #. 50000 #. -#. +#. #. #. @@ -12775,6 +12956,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 "" "Maximum aantal segmenten toegestaan in een aangemaakte weg (standaard 250)." @@ -12798,10 +12978,9 @@ #: ../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." -msgstr "" -"Nauwkeurigheid van de Douglas-Peucker lijnvereenvoudiging, gemeten in " -"graden.
Lagere waarden resulteren in meer knopen en nauwkeurigere lijnen. " +"Accuracy of Douglas-Peucker line simplification, measured in degrees." +"
Lower values give more nodes, and more accurate lines. Default 0.0003." +msgstr "" +"Nauwkeurigheid van de Douglas-Peucker lijnvereenvoudiging, gemeten in graden." +"
Lagere waarden resulteren in meer knopen en nauwkeurigere lijnen. " "Standaard 0.0003." @@ -12866,20 +13045,19 @@ msgstr "Kan afbeelding niet ophalen" -#: ../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 "Verbinden" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Verbonden" -#. 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 "Niet verbonden" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "Verbinding is mislukt" @@ -12926,6 +13104,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 msgid "Connect to gpsd server and show current position in LiveGPS layer." -msgstr "" -"Met gpsd-server verbinden en de huidige locatie in LiveGPS-laag tonen." +msgstr "Met gpsd-server verbinden en de huidige locatie in LiveGPS-laag tonen." #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 @@ -13084,7 +13261,7 @@ "upload this data. Maybe you have selected the wrong layer?" msgstr "" -"De geselecteerde gegevens bevatten gegevens van " -"OpenStreetBugs.
Deze gegevens kan je niet uploaden. Heb je misschien de " -"verkeerde laag geselecteerd?" +"De geselecteerde gegevens bevatten gegevens van OpenStreetBugs." +"
Deze gegevens kan je niet uploaden. Heb je misschien de verkeerde laag " +"geselecteerd?" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -13100,6 +13277,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 "" "Kop bevat meerdere waarden en kan niet in een enkele string worden geplaatst" @@ -13183,9 +13359,10 @@ msgstr "Onbekende bestandsextentie: {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 "Osmarender" -#: ../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 " @@ -13195,9 +13372,5 @@ "kaartinstellingenpagina van Voorkeuren." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "osmarender-optie" - -#: ../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 "Firefox-executable" @@ -13574,17 +13747,17 @@ msgstr "U dient eerst bronnen van tagvoorkeuzen in Voorkeuren op te geven." -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" msgstr "Het terras omkeren" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37 msgid "Reverses house numbers on a terrace." msgstr "De huisnummers op een terras omkeren" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 msgid "Reverse a Terrace" msgstr "Een terras omkeren" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110 msgid "Reverse Terrace" msgstr "" @@ -13628,172 +13801,4 @@ msgid "Optional" msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "Overlappende gebieden samenvoegen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Joins areas that overlap each other" -msgstr "Overlappende gebieden samenvoegen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 -msgid "Only up to two areas can be joined at the moment." -msgstr "Op dit moment kunnen maximaal twee gebieden worden samengevoegd." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 -#, java-format -msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "\"{0}\" is niet gesloten en kan daarom niet worden samengevoegd." - -#: ../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 "" -"Knopen van de geselecteerde weg(gen) liggen buiten het gedownloade " -"gegevensgebied.\n" -"Hierdoor kunnen knopen onbedoeld gewist worden.\n" -"Weet je zeker dat je verder wilt gaan?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 -msgid "Please abort if you are not sure" -msgstr "Breek af als je het niet zeker weet" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 -msgid "Please select at least one closed way the should be joined." -msgstr "Selecteer minstens één gesloten weg die samengevoegd moet worden." - -#: ../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 "" -"Enkele wegen vormden onderdeel van relaties die zijn aangepast. Controleer " -"of er geen fouten zijn geïntroduceerd." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 -msgid "Enter values for all conflicts." -msgstr "Waarden voor alle conflicten invoeren." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Conflicten oplossen" - -#: ../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 "Naar positie springen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Opens a dialog that allows to jump to a specific location" -msgstr "" -"Een dialoogvenster openen waarmee naar een bepaalde locatie kan worden " -"gesprongen." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 -msgid "Enter Lat/Lon to jump to position." -msgstr "Lat/lon invoeren om naar toe te springen." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 -msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "Je kunt ook een URL van www.openstreetmap.org inplakken." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 -msgid "Zoom (in metres)" -msgstr "Zoom (in metres)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -msgid "Jump there" -msgstr "Spring daarheen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 -msgid "Jump to Position" -msgstr "Spring naar positie" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Could not parse Latitude, Longitude or Zoom. Please check." -msgstr "" -"Kan lengte- of breedtegraad of zoom niet ontleden. Controleer deze s.v.p." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Unable to parse Lon/Lat" -msgstr "Kan lat/lon niet ontleden." - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Simplify Way" -msgstr "Weg vereenvoudigen" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Ongebruikte knopen van een weg verwijderen." - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "Selecteer minimaal één weg om te vereenvoudigen." - -#: ../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] "" -"De selectie bevat {0} weg. Weet je zeker dat je deze wilt vereenvoudigen?" -msgstr[1] "" -"De selectie bevat {0} wegen. Weet je zeker dat je ze allemaal wilt " -"vereenvoudigen?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "Weet je het zeker?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13893,5 +13898,5 @@ msgstr "Validatie andere" -#: ../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}" @@ -13944,34 +13949,34 @@ msgstr "De geselecteerde fouten de volgende keer negeren." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Gehele groep" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Individuele elementen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Niets" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Gehele groep of individuele elementen negeren?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 msgid "Ignoring elements" msgstr "Elementen negeren" -#: ../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 "" @@ -14020,19 +14025,19 @@ msgstr "Kruisende wegen" -#: ../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 "Dubbele knopen" -#: ../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 "" "Deze test controleert of er geen knopen met precies dezelfde locatie zijn." -#: ../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 "" @@ -14271,11 +14276,10 @@ #: ../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." -msgstr "" -"De bronnen (URL of bestandsnaam) van spellingscontrole (zie " -"http://wiki.openstreetmap.org/index.php/User:JLS/speller) of " -"gegevensbestanden van tagchecker." +"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." +"org/index.php/User:JLS/speller) or tag checking data files." +msgstr "" +"De bronnen (URL of bestandsnaam) van spellingscontrole (zie http://wiki." +"openstreetmap.org/index.php/User:JLS/speller) of gegevensbestanden van " +"tagchecker." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 @@ -14417,5 +14421,5 @@ #. 50000 #. -#. +#. #. #. @@ -14423,5 +14427,5 @@ #. #. -#. +#. #. #. @@ -14431,5 +14435,5 @@ #. 50000 #. -#. +#. #. #. @@ -14438,5 +14442,5 @@ #. 50000 #. -#. +#. #. #. @@ -14445,5 +14449,5 @@ #. 50000 #. -#. +#. #. #. @@ -14452,5 +14456,5 @@ #. 50000 #. -#. +#. #. #. @@ -14459,5 +14463,5 @@ #. 50000 #. -#. +#. #. #. @@ -14466,9 +14470,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14513,5 +14517,5 @@ #. 50000 #. -#. +#. #. #. @@ -14648,14 +14652,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 " @@ -14664,14 +14668,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 "" @@ -14680,5 +14684,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 "" @@ -14690,13 +14694,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." @@ -14854,50 +14858,50 @@ "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "Zichtbare tegels downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "Resolutie veranderen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Reload erroneous tiles" msgstr "Foutieve tegels herladen" -#: ../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 "WMS-laag in bestand opslaan" -#: ../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 "WMS-laag uit bestand laden" -#: ../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 "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "File Format Error" msgstr "Fout in bestandsindeling" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "Laden bestand is mislukt" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -14974,5 +14978,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 "" @@ -15014,21 +15018,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 " @@ -15040,21 +15039,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 " @@ -15063,10 +15062,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 " @@ -15075,21 +15074,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 " @@ -15099,16 +15097,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 " @@ -15118,10 +15116,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 " @@ -15130,5 +15128,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 " @@ -15138,27 +15136,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 " @@ -15167,15 +15165,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 +msgid "Let other applications send commands to JOSM." +msgstr "" + +#. Plugin routes #: build/trans_plugins.java:55 -msgid "Let other applications send commands to JOSM." -msgstr "" - -#. Plugin routes -#: build/trans_plugins.java:57 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15184,10 +15182,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 " @@ -15196,15 +15194,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 " @@ -15214,17 +15212,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 " @@ -15233,5 +15224,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15240,10 +15231,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, ...)." @@ -16296,8 +16287,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16494,5 +16485,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16502,5 +16493,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16519,5 +16510,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16527,5 +16518,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16544,5 +16535,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16552,5 +16543,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16569,5 +16560,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16577,5 +16568,5 @@ #. 300000 #. -#. +#. #. #. @@ -16590,5 +16581,5 @@ #. 300000 #. -#. +#. #. #. @@ -16606,5 +16597,5 @@ #. 50000 #. -#. +#. #. #. @@ -16622,5 +16613,5 @@ #. 40000 #. -#. +#. #. #. @@ -16629,5 +16620,5 @@ #. 40000 #. -#. +#. #. #. @@ -16637,5 +16628,5 @@ #. 50000 #. -#. +#. #. #. @@ -16655,5 +16646,5 @@ #. 50000 #. -#. +#. #. #. @@ -16662,5 +16653,5 @@ #. 50000 #. -#. +#. #. #. @@ -16670,5 +16661,5 @@ #. 50000 #. -#. +#. #. #. @@ -16718,7 +16709,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17417,5 +17408,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17454,5 +17445,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17548,5 +17539,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17703,5 +17694,5 @@ #. 50000 #. -#. +#. #. #. @@ -19088,5 +19079,5 @@ #. 30000 #. -#. +#. #. #. @@ -19096,5 +19087,5 @@ #. 40000 #. -#. +#. #. #. @@ -19104,5 +19095,5 @@ #. 20000 #. -#. +#. #. #. @@ -19112,5 +19103,5 @@ #. 40000 #. -#. +#. #. #. @@ -19468,7 +19459,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19478,5 +19469,5 @@ #. 50000 #. -#. +#. #. #. @@ -19486,5 +19477,5 @@ #. 50000 #. -#. +#. #. #. @@ -19494,5 +19485,5 @@ #. 50000 #. -#. +#. #. #. @@ -19502,5 +19493,5 @@ #. 50000 #. -#. +#. #. #. @@ -19510,5 +19501,5 @@ #. 50000 #. -#. +#. #. #. @@ -19518,5 +19509,5 @@ #. 50000 #. -#. +#. #. #. @@ -19526,5 +19517,5 @@ #. 50000 #. -#. +#. #. #. @@ -19534,5 +19525,5 @@ #. 50000 #. -#. +#. #. #. @@ -19542,5 +19533,5 @@ #. 50000 #. -#. +#. #. #. @@ -19550,5 +19541,5 @@ #. 50000 #. -#. +#. #. #. @@ -19558,5 +19549,5 @@ #. 50000 #. -#. +#. #. #. @@ -19566,5 +19557,5 @@ #. 50000 #. -#. +#. #. #. @@ -19574,5 +19565,5 @@ #. 50000 #. -#. +#. #. #. @@ -19582,5 +19573,5 @@ #. 50000 #. -#. +#. #. #. @@ -19590,5 +19581,5 @@ #. 50000 #. -#. +#. #. #. @@ -19598,5 +19589,5 @@ #. 50000 #. -#. +#. #. #. @@ -19606,5 +19597,5 @@ #. 50000 #. -#. +#. #. #. @@ -19614,5 +19605,5 @@ #. 50000 #. -#. +#. #. #. @@ -19622,5 +19613,5 @@ #. 50000 #. -#. +#. #. #. @@ -19630,5 +19621,5 @@ #. 50000 #. -#. +#. #. #. @@ -19638,5 +19629,5 @@ #. 50000 #. -#. +#. #. #. @@ -19646,5 +19637,5 @@ #. 50000 #. -#. +#. #. #. @@ -19654,5 +19645,5 @@ #. 50000 #. -#. +#. #. #. @@ -19662,5 +19653,5 @@ #. 50000 #. -#. +#. #. #. @@ -19670,5 +19661,5 @@ #. 50000 #. -#. +#. #. #. @@ -19678,5 +19669,5 @@ #. 50000 #. -#. +#. #. #. @@ -19686,5 +19677,5 @@ #. 50000 #. -#. +#. #. #. @@ -19694,5 +19685,5 @@ #. 50000 #. -#. +#. #. #. @@ -19702,5 +19693,5 @@ #. 50000 #. -#. +#. #. #. @@ -19710,5 +19701,5 @@ #. 50000 #. -#. +#. #. #. @@ -19718,5 +19709,5 @@ #. 50000 #. -#. +#. #. #. @@ -19726,5 +19717,5 @@ #. 50000 #. -#. +#. #. #. @@ -19734,5 +19725,5 @@ #. 50000 #. -#. +#. #. #. @@ -19742,5 +19733,5 @@ #. 50000 #. -#. +#. #. #. @@ -19750,5 +19741,5 @@ #. 50000 #. -#. +#. #. #. @@ -19758,5 +19749,5 @@ #. 50000 #. -#. +#. #. #. @@ -19766,5 +19757,5 @@ #. 50000 #. -#. +#. #. #. @@ -19774,5 +19765,5 @@ #. 50000 #. -#. +#. #. #. @@ -19782,5 +19773,5 @@ #. 50000 #. -#. +#. #. #. @@ -19790,5 +19781,5 @@ #. 50000 #. -#. +#. #. #. @@ -19798,5 +19789,5 @@ #. 50000 #. -#. +#. #. #. @@ -19806,5 +19797,5 @@ #. 50000 #. -#. +#. #. #. @@ -19814,5 +19805,5 @@ #. 50000 #. -#. +#. #. #. @@ -19822,5 +19813,5 @@ #. 50000 #. -#. +#. #. #. @@ -19830,5 +19821,5 @@ #. 50000 #. -#. +#. #. #. @@ -19838,5 +19829,5 @@ #. 50000 #. -#. +#. #. #. @@ -21530,7 +21521,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21540,5 +21531,5 @@ #. 50000 #. -#. +#. #. #. @@ -21548,5 +21539,5 @@ #. 50000 #. -#. +#. #. #. @@ -21556,5 +21547,5 @@ #. 50000 #. -#. +#. #. #. @@ -21564,5 +21555,5 @@ #. 50000 #. -#. +#. #. #. @@ -21572,5 +21563,5 @@ #. 50000 #. -#. +#. #. #. @@ -21580,5 +21571,5 @@ #. 50000 #. -#. +#. #. #. @@ -21588,5 +21579,5 @@ #. 50000 #. -#. +#. #. #. @@ -22917,5 +22908,5 @@ #. 40000 #. -#. +#. #. #. @@ -22931,5 +22922,5 @@ #. 30000 #. -#. +#. #. #. @@ -22940,7 +22931,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22950,5 +22941,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22958,13 +22957,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22974,5 +22965,5 @@ #. 50000 #. -#. +#. #. #. @@ -23005,5 +22996,5 @@ #. 50000 #. -#. +#. #. #. @@ -23019,5 +23010,5 @@ #. 50000 #. -#. +#. #. #. @@ -23027,5 +23018,5 @@ #. 10000 #. -#. +#. #. #. @@ -23035,5 +23026,5 @@ #. 10000 #. -#. +#. #. #. @@ -23044,5 +23035,5 @@ #. 10000 #. -#. +#. #. #. @@ -23071,5 +23062,5 @@ #. 50000 #. -#. +#. #. #. @@ -23184,9 +23175,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 @@ -23194,5 +23185,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, @@ -23202,8 +23193,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 @@ -23217,5 +23208,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23223,5 +23214,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23270,6 +23261,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23349,5 +23340,5 @@ #. 40000 #. -#. +#. #. #. @@ -23357,5 +23348,5 @@ #. 10000 #. -#. +#. #. #. @@ -23364,5 +23355,5 @@ #. 50000 #. -#. +#. #. #. @@ -23372,5 +23363,5 @@ #. 50000 #. -#. +#. #. #. @@ -23379,5 +23370,5 @@ #. 50000 #. -#. +#. #. #. @@ -23386,5 +23377,5 @@ #. 50000 #. -#. +#. #. #. @@ -23393,5 +23384,5 @@ #. 50000 #. -#. +#. #. #. @@ -23400,5 +23391,5 @@ #. 50000 #. -#. +#. #. #. @@ -23407,5 +23398,5 @@ #. 40000 #. -#. +#. #. #. @@ -23414,5 +23405,5 @@ #. 50000 #. -#. +#. #. #. @@ -23421,5 +23412,5 @@ #. 50000 #. -#. +#. #. #. @@ -23428,5 +23419,5 @@ #. 50000 #. -#. +#. #. #. @@ -23435,5 +23426,5 @@ #. 50000 #. -#. +#. #. #. @@ -23442,5 +23433,5 @@ #. 50000 #. -#. +#. #. #. @@ -23449,5 +23440,5 @@ #. 50000 #. -#. +#. #. #. @@ -23457,5 +23448,5 @@ #. 50000 #. -#. +#. #. #. @@ -23464,5 +23455,5 @@ #. 50000 #. -#. +#. #. #. @@ -23473,5 +23464,5 @@ #. 50000 #. -#. +#. #. #. @@ -23483,11 +23474,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23496,7 +23487,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23507,5 +23498,5 @@ #. 50000 #. -#. +#. #. #. @@ -23516,5 +23507,5 @@ #. 50000 #. -#. +#. #. #. @@ -23525,5 +23516,5 @@ #. 50000 #. -#. +#. #. #. @@ -23534,5 +23525,5 @@ #. 50000 #. -#. +#. #. #. @@ -23543,5 +23534,5 @@ #. 50000 #. -#. +#. #. #. @@ -23552,5 +23543,5 @@ #. 40000 #. -#. +#. #. #. @@ -23562,5 +23553,5 @@ #. 50000 #. -#. +#. #. #. @@ -23571,5 +23562,5 @@ #. 50000 #. -#. +#. #. #. @@ -23594,5 +23585,5 @@ #. 10000 #. -#. +#. #. #. @@ -23601,5 +23592,5 @@ #. 50000 #. -#. +#. #. #. @@ -23608,5 +23599,5 @@ #. 50000 #. -#. +#. #. #. @@ -23622,5 +23613,5 @@ #. 20000 #. -#. +#. #. #. @@ -23634,5 +23625,5 @@ #. 30000 #. -#. +#. #. #. @@ -23641,5 +23632,5 @@ #. 50000 #. -#. +#. #. #. @@ -23648,5 +23639,5 @@ #. 50000 #. -#. +#. #. #. @@ -23655,5 +23646,5 @@ #. 50000 #. -#. +#. #. #. @@ -23662,5 +23653,5 @@ #. 50000 #. -#. +#. #. #. @@ -23669,5 +23660,5 @@ #. 50000 #. -#. +#. #. #. @@ -23676,5 +23667,5 @@ #. 50000 #. -#. +#. #. #. @@ -23683,5 +23674,5 @@ #. 50000 #. -#. +#. #. #. @@ -23690,5 +23681,5 @@ #. 50000 #. -#. +#. #. #. @@ -23697,5 +23688,5 @@ #. 50000 #. -#. +#. #. #. @@ -23704,5 +23695,5 @@ #. 50000 #. -#. +#. #. #. @@ -23711,5 +23702,5 @@ #. 50000 #. -#. +#. #. #. @@ -23718,5 +23709,5 @@ #. 50000 #. -#. +#. #. #. @@ -23725,5 +23716,5 @@ #. 50000 #. -#. +#. #. #. @@ -23732,5 +23723,5 @@ #. 50000 #. -#. +#. #. #. @@ -23901,7 +23892,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23915,5 +23906,5 @@ #. 40000 #. -#. +#. #. #. @@ -23923,7 +23914,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23933,5 +23924,5 @@ #. 50000 #. -#. +#. #. #. @@ -23941,5 +23932,5 @@ #. 50000 #. -#. +#. #. #. @@ -23949,5 +23940,5 @@ #. 50000 #. -#. +#. #. #. @@ -23957,5 +23948,5 @@ #. 50000 #. -#. +#. #. #. @@ -23971,5 +23962,5 @@ #. 10000 #. -#. +#. #. #. @@ -23979,5 +23970,5 @@ #. 50000 #. -#. +#. #. #. @@ -23987,5 +23978,5 @@ #. 50000 #. -#. +#. #. #. @@ -23995,5 +23986,5 @@ #. 50000 #. -#. +#. #. #. @@ -24003,5 +23994,5 @@ #. 50000 #. -#. +#. #. #. @@ -24011,5 +24002,5 @@ #. 50000 #. -#. +#. #. #. @@ -24019,5 +24010,5 @@ #. 50000 #. -#. +#. #. #. @@ -24036,5 +24027,5 @@ #. 50000 #. -#. +#. #. #. @@ -24043,5 +24034,5 @@ #. 50000 #. -#. +#. #. #. @@ -24055,5 +24046,5 @@ #. 50000 #. -#. +#. #. #. @@ -24067,5 +24058,5 @@ #. 50000 #. -#. +#. #. #. @@ -24074,5 +24065,5 @@ #. 50000 #. -#. +#. #. #. @@ -24086,5 +24077,5 @@ #. 50000 #. -#. +#. #. #. @@ -24099,5 +24090,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24112,5 +24103,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24124,5 +24115,5 @@ #. 50000 #. -#. +#. #. #. @@ -24136,5 +24127,5 @@ #. 50000 #. -#. +#. #. #. @@ -24143,5 +24134,5 @@ #. 50000 #. -#. +#. #. #. @@ -24150,5 +24141,5 @@ #. 50000 #. -#. +#. #. #. @@ -24162,5 +24153,5 @@ #. 50000 #. -#. +#. #. #. @@ -24170,5 +24161,5 @@ #. 50000 #. -#. +#. #. #. @@ -24177,5 +24168,5 @@ #. 50000 #. -#. +#. #. #. @@ -24184,5 +24175,5 @@ #. 50000 #. -#. +#. #. #. @@ -24191,5 +24182,5 @@ #. 50000 #. -#. +#. #. #. @@ -24199,5 +24190,5 @@ #. 50000 #. -#. +#. #. #. @@ -24208,5 +24199,5 @@ #. 50000 #. -#. +#. #. #. @@ -24216,7 +24207,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24226,5 +24217,5 @@ #. 50000 #. -#. +#. #. #. @@ -24234,5 +24225,5 @@ #. 50000 #. -#. +#. #. #. @@ -24242,5 +24233,5 @@ #. 50000 #. -#. +#. #. #. @@ -24251,5 +24242,5 @@ #. 50000 #. -#. +#. #. #. @@ -24259,5 +24250,5 @@ #. 50000 #. -#. +#. #. #. @@ -24267,5 +24258,5 @@ #. 50000 #. -#. +#. #. #. @@ -24275,5 +24266,5 @@ #. 50000 #. -#. +#. #. #. @@ -24283,5 +24274,5 @@ #. 50000 #. -#. +#. #. #. @@ -24291,5 +24282,5 @@ #. 50000 #. -#. +#. #. #. @@ -24299,5 +24290,5 @@ #. 50000 #. -#. +#. #. #. @@ -24307,5 +24298,5 @@ #. 50000 #. -#. +#. #. #. @@ -24315,5 +24306,5 @@ #. 50000 #. -#. +#. #. #. @@ -24336,7 +24327,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24346,5 +24337,5 @@ #. 50000 #. -#. +#. #. #. @@ -24353,5 +24344,5 @@ #. 50000 #. -#. +#. #. #. @@ -24361,5 +24352,5 @@ #. 50000 #. -#. +#. #. #. @@ -24368,5 +24359,5 @@ #. 50000 #. -#. +#. #. #. @@ -24376,5 +24367,5 @@ #. 50000 #. -#. +#. #. #. @@ -24384,5 +24375,5 @@ #. 50000 #. -#. +#. #. #. @@ -24398,5 +24389,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24407,5 +24398,5 @@ #. 50000 #. -#. +#. #. #. @@ -24424,5 +24415,5 @@ #. 50000 #. -#. +#. #. #. @@ -24432,5 +24423,5 @@ #. 50000 #. -#. +#. #. #. @@ -24443,5 +24434,5 @@ #. 50000 #. -#. +#. #. #. @@ -24459,5 +24450,5 @@ #. 50000 #. -#. +#. #. #. @@ -24466,5 +24457,5 @@ #. 50000 #. -#. +#. #. #. @@ -24473,5 +24464,5 @@ #. 50000 #. -#. +#. #. #. @@ -24480,7 +24471,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24491,5 +24482,5 @@ #. 50000 #. -#. +#. #. #. @@ -24504,5 +24495,5 @@ #. 50000 #. -#. +#. #. #. @@ -24516,5 +24507,5 @@ #. 50000 #. -#. +#. #. #. @@ -24524,5 +24515,5 @@ #. 50000 #. -#. +#. #. #. @@ -24536,5 +24527,5 @@ #. 50000 #. -#. +#. #. #. @@ -24548,5 +24539,5 @@ #. 50000 #. -#. +#. #. #. @@ -24555,7 +24546,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24565,5 +24556,5 @@ #. 50000 #. -#. +#. #. #. @@ -24573,5 +24564,5 @@ #. 50000 #. -#. +#. #. #. @@ -24581,5 +24572,5 @@ #. 50000 #. -#. +#. #. #. @@ -24589,5 +24580,5 @@ #. 50000 #. -#. +#. #. #. @@ -24603,7 +24594,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24618,5 +24609,5 @@ #. 30000 #. -#. +#. #. #. @@ -24631,5 +24622,5 @@ #. 30000 #. -#. +#. #. #. @@ -24644,5 +24635,5 @@ #. 30000 #. -#. +#. #. #. @@ -24657,5 +24648,5 @@ #. 30000 #. -#. +#. #. #. @@ -24670,5 +24661,5 @@ #. 30000 #. -#. +#. #. #. @@ -24683,7 +24674,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24693,5 +24684,5 @@ #. 50000 #. -#. +#. #. #. @@ -24700,5 +24691,5 @@ #. 50000 #. -#. +#. #. #. @@ -24708,5 +24699,5 @@ #. 50000 #. -#. +#. #. #. @@ -24716,5 +24707,5 @@ #. 50000 #. -#. +#. #. #. @@ -24724,5 +24715,5 @@ #. 50000 #. -#. +#. #. #. @@ -24732,5 +24723,5 @@ #. 50000 #. -#. +#. #. #. @@ -24740,5 +24731,5 @@ #. 50000 #. -#. +#. #. #. @@ -24748,5 +24739,5 @@ #. 50000 #. -#. +#. #. #. @@ -24756,5 +24747,5 @@ #. 50000 #. -#. +#. #. #. @@ -24764,5 +24755,5 @@ #. 50000 #. -#. +#. #. #. @@ -24772,5 +24763,5 @@ #. 50000 #. -#. +#. #. #. @@ -24780,5 +24771,5 @@ #. 50000 #. -#. +#. #. #. @@ -24788,5 +24779,5 @@ #. 50000 #. -#. +#. #. #. @@ -24806,5 +24797,5 @@ #. 50000 #. -#. +#. #. #. @@ -24819,5 +24810,5 @@ #. 50000 #. -#. +#. #. #. @@ -24830,7 +24821,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24840,5 +24831,5 @@ #. 50000 #. -#. +#. #. #. @@ -24848,5 +24839,5 @@ #. 50000 #. -#. +#. #. #. @@ -24856,5 +24847,5 @@ #. 50000 #. -#. +#. #. #. @@ -24864,5 +24855,5 @@ #. 50000 #. -#. +#. #. #. @@ -24872,5 +24863,5 @@ #. 50000 #. -#. +#. #. #. @@ -24880,5 +24871,5 @@ #. 50000 #. -#. +#. #. #. @@ -24888,5 +24879,5 @@ #. 50000 #. -#. +#. #. #. @@ -24896,5 +24887,5 @@ #. 50000 #. -#. +#. #. #. @@ -24904,5 +24895,5 @@ #. 50000 #. -#. +#. #. #. @@ -24912,5 +24903,5 @@ #. 50000 #. -#. +#. #. #. @@ -24920,5 +24911,5 @@ #. 50000 #. -#. +#. #. #. @@ -24928,5 +24919,5 @@ #. 50000 #. -#. +#. #. #. @@ -24936,5 +24927,5 @@ #. 50000 #. -#. +#. #. #. @@ -24944,5 +24935,5 @@ #. 50000 #. -#. +#. #. #. @@ -24963,5 +24954,5 @@ #. 50000 #. -#. +#. #. #. @@ -24975,7 +24966,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24985,5 +24976,5 @@ #. 50000 #. -#. +#. #. #. @@ -24993,5 +24984,5 @@ #. 50000 #. -#. +#. #. #. @@ -25001,5 +24992,5 @@ #. 50000 #. -#. +#. #. #. @@ -25009,5 +25000,5 @@ #. 50000 #. -#. +#. #. #. @@ -25017,5 +25008,5 @@ #. 50000 #. -#. +#. #. #. @@ -25025,5 +25016,5 @@ #. 50000 #. -#. +#. #. #. @@ -25033,5 +25024,5 @@ #. 50000 #. -#. +#. #. #. @@ -25048,5 +25039,5 @@ #. 50000 #. -#. +#. #. #. @@ -25056,5 +25047,5 @@ #. 50000 #. -#. +#. #. #. @@ -25064,5 +25055,5 @@ #. 50000 #. -#. +#. #. #. @@ -25072,5 +25063,5 @@ #. 50000 #. -#. +#. #. #. @@ -25080,5 +25071,5 @@ #. 50000 #. -#. +#. #. #. @@ -25088,5 +25079,5 @@ #. 50000 #. -#. +#. #. #. @@ -25096,5 +25087,5 @@ #. 50000 #. -#. +#. #. #. @@ -25104,5 +25095,5 @@ #. 50000 #. -#. +#. #. #. @@ -25112,5 +25103,5 @@ #. 50000 #. -#. +#. #. #. @@ -25120,5 +25111,5 @@ #. 50000 #. -#. +#. #. #. @@ -25128,5 +25119,5 @@ #. 50000 #. -#. +#. #. #. @@ -25136,5 +25127,5 @@ #. 50000 #. -#. +#. #. #. @@ -25153,5 +25144,5 @@ #. 50000 #. -#. +#. #. #. @@ -25161,5 +25152,5 @@ #. 50000 #. -#. +#. #. #. @@ -25168,5 +25159,5 @@ #. 50000 #. -#. +#. #. #. @@ -25176,5 +25167,5 @@ #. 50000 #. -#. +#. #. #. @@ -25184,5 +25175,5 @@ #. 50000 #. -#. +#. #. #. @@ -25192,5 +25183,5 @@ #. 50000 #. -#. +#. #. #. @@ -25199,5 +25190,5 @@ #. 50000 #. -#. +#. #. #. @@ -25207,5 +25198,5 @@ #. 50000 #. -#. +#. #. #. @@ -25215,5 +25206,5 @@ #. 50000 #. -#. +#. #. #. @@ -25223,5 +25214,5 @@ #. 50000 #. -#. +#. #. #. @@ -25231,5 +25222,5 @@ #. 50000 #. -#. +#. #. #. @@ -25238,5 +25229,5 @@ #. 50000 #. -#. +#. #. #. @@ -25245,5 +25236,5 @@ #. 50000 #. -#. +#. #. #. @@ -25252,5 +25243,5 @@ #. 50000 #. -#. +#. #. #. @@ -25259,5 +25250,5 @@ #. 50000 #. -#. +#. #. #. @@ -25266,5 +25257,5 @@ #. 50000 #. -#. +#. #. #. @@ -25273,5 +25264,5 @@ #. 50000 #. -#. +#. #. #. @@ -25280,5 +25271,5 @@ #. 50000 #. -#. +#. #. #. @@ -25287,5 +25278,5 @@ #. 50000 #. -#. +#. #. #. @@ -25294,5 +25285,5 @@ #. 50000 #. -#. +#. #. #. @@ -25301,5 +25292,5 @@ #. 50000 #. -#. +#. #. #. @@ -25308,5 +25299,5 @@ #. 50000 #. -#. +#. #. #. @@ -25315,5 +25306,5 @@ #. 50000 #. -#. +#. #. #. @@ -25322,5 +25313,5 @@ #. 50000 #. -#. +#. #. #. @@ -25330,5 +25321,5 @@ #. 50000 #. -#. +#. #. #. @@ -25338,5 +25329,5 @@ #. 50000 #. -#. +#. #. #. @@ -25346,5 +25337,5 @@ #. 50000 #. -#. +#. #. #. @@ -25354,5 +25345,5 @@ #. 50000 #. -#. +#. #. #. @@ -25362,5 +25353,5 @@ #. 50000 #. -#. +#. #. #. @@ -25370,5 +25361,5 @@ #. 50000 #. -#. +#. #. #. @@ -25378,5 +25369,5 @@ #. 50000 #. -#. +#. #. #. @@ -25386,5 +25377,5 @@ #. 50000 #. -#. +#. #. #. @@ -25394,5 +25385,5 @@ #. 50000 #. -#. +#. #. #. @@ -25403,5 +25394,5 @@ #. 50000 #. -#. +#. #. #. @@ -25411,5 +25402,5 @@ #. 50000 #. -#. +#. #. #. @@ -25419,5 +25410,5 @@ #. 50000 #. -#. +#. #. #. @@ -25427,5 +25418,5 @@ #. 50000 #. -#. +#. #. #. @@ -25435,5 +25426,5 @@ #. 50000 #. -#. +#. #. #. @@ -25443,5 +25434,5 @@ #. 50000 #. -#. +#. #. #. @@ -25451,5 +25442,5 @@ #. 50000 #. -#. +#. #. #. @@ -25459,5 +25450,5 @@ #. 50000 #. -#. +#. #. #. @@ -25467,5 +25458,5 @@ #. 50000 #. -#. +#. #. #. @@ -25475,5 +25466,5 @@ #. 50000 #. -#. +#. #. #. @@ -25483,5 +25474,5 @@ #. 50000 #. -#. +#. #. #. @@ -25491,5 +25482,5 @@ #. 50000 #. -#. +#. #. #. @@ -25499,5 +25490,5 @@ #. 50000 #. -#. +#. #. #. @@ -25507,5 +25498,5 @@ #. 50000 #. -#. +#. #. #. @@ -25515,5 +25506,5 @@ #. 50000 #. -#. +#. #. #. @@ -25523,5 +25514,5 @@ #. 50000 #. -#. +#. #. #. @@ -25531,5 +25522,5 @@ #. 50000 #. -#. +#. #. #. @@ -25539,5 +25530,5 @@ #. 50000 #. -#. +#. #. #. @@ -25547,5 +25538,5 @@ #. 50000 #. -#. +#. #. #. @@ -25554,5 +25545,5 @@ #. 50000 #. -#. +#. #. #. @@ -25584,5 +25575,5 @@ #. 50000 #. -#. +#. #. #. @@ -25592,5 +25583,5 @@ #. 50000 #. -#. +#. #. #. @@ -25600,7 +25591,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25615,5 +25606,5 @@ #. 50000 #. -#. +#. #. #. @@ -25623,5 +25614,5 @@ #. 50000 #. -#. +#. #. #. @@ -25631,5 +25622,5 @@ #. 50000 #. -#. +#. #. #. @@ -25639,5 +25630,5 @@ #. 50000 #. -#. +#. #. #. @@ -25647,5 +25638,5 @@ #. 50000 #. -#. +#. #. #. @@ -25655,5 +25646,5 @@ #. 50000 #. -#. +#. #. #. @@ -25663,5 +25654,5 @@ #. 50000 #. -#. +#. #. #. @@ -25677,7 +25668,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25687,5 +25678,5 @@ #. 50000 #. -#. +#. #. #. @@ -25695,5 +25686,5 @@ #. 50000 #. -#. +#. #. #. @@ -25703,5 +25694,5 @@ #. 50000 #. -#. +#. #. #. @@ -25711,5 +25702,5 @@ #. 50000 #. -#. +#. #. #. @@ -25719,5 +25710,5 @@ #. 50000 #. -#. +#. #. #. @@ -25727,5 +25718,5 @@ #. 50000 #. -#. +#. #. #. @@ -25735,5 +25726,5 @@ #. 50000 #. -#. +#. #. #. @@ -25743,5 +25734,5 @@ #. 50000 #. -#. +#. #. #. @@ -25751,5 +25742,5 @@ #. 50000 #. -#. +#. #. #. @@ -25759,5 +25750,5 @@ #. 50000 #. -#. +#. #. #. @@ -25767,5 +25758,5 @@ #. 50000 #. -#. +#. #. #. @@ -25775,5 +25766,5 @@ #. 50000 #. -#. +#. #. #. @@ -25783,5 +25774,5 @@ #. 50000 #. -#. +#. #. #. @@ -25791,5 +25782,5 @@ #. 50000 #. -#. +#. #. #. @@ -25799,5 +25790,5 @@ #. 50000 #. -#. +#. #. #. @@ -25807,5 +25798,5 @@ #. 50000 #. -#. +#. #. #. @@ -25815,5 +25806,5 @@ #. 50000 #. -#. +#. #. #. @@ -25823,5 +25814,5 @@ #. 50000 #. -#. +#. #. #. @@ -25831,5 +25822,5 @@ #. 50000 #. -#. +#. #. #. @@ -25839,5 +25830,5 @@ #. 50000 #. -#. +#. #. #. @@ -25847,5 +25838,5 @@ #. 50000 #. -#. +#. #. #. @@ -25855,5 +25846,5 @@ #. 50000 #. -#. +#. #. #. @@ -25863,5 +25854,5 @@ #. 50000 #. -#. +#. #. #. @@ -25871,5 +25862,5 @@ #. 50000 #. -#. +#. #. #. @@ -25879,5 +25870,5 @@ #. 50000 #. -#. +#. #. #. @@ -25887,5 +25878,5 @@ #. 50000 #. -#. +#. #. #. @@ -25895,5 +25886,5 @@ #. 50000 #. -#. +#. #. #. @@ -25903,5 +25894,5 @@ #. 50000 #. -#. +#. #. #. @@ -25911,5 +25902,5 @@ #. 50000 #. -#. +#. #. #. @@ -25919,5 +25910,5 @@ #. 50000 #. -#. +#. #. #. @@ -25927,5 +25918,5 @@ #. 50000 #. -#. +#. #. #. @@ -25935,5 +25926,5 @@ #. 50000 #. -#. +#. #. #. @@ -25943,5 +25934,5 @@ #. 50000 #. -#. +#. #. #. @@ -25951,5 +25942,5 @@ #. 50000 #. -#. +#. #. #. @@ -25959,5 +25950,5 @@ #. 50000 #. -#. +#. #. #. @@ -25967,5 +25958,5 @@ #. 50000 #. -#. +#. #. #. @@ -25975,5 +25966,5 @@ #. 50000 #. -#. +#. #. #. @@ -25983,5 +25974,5 @@ #. 50000 #. -#. +#. #. #. @@ -25991,5 +25982,5 @@ #. 50000 #. -#. +#. #. #. @@ -25999,5 +25990,5 @@ #. 50000 #. -#. +#. #. #. @@ -26007,5 +25998,5 @@ #. 50000 #. -#. +#. #. #. @@ -26015,5 +26006,5 @@ #. 50000 #. -#. +#. #. #. @@ -26049,7 +26040,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26059,5 +26050,5 @@ #. 50000 #. -#. +#. #. #. @@ -26067,5 +26058,5 @@ #. 50000 #. -#. +#. #. #. @@ -26075,5 +26066,5 @@ #. 50000 #. -#. +#. #. #. @@ -26083,5 +26074,5 @@ #. 50000 #. -#. +#. #. #. @@ -26091,5 +26082,5 @@ #. 50000 #. -#. +#. #. #. @@ -26099,5 +26090,5 @@ #. 50000 #. -#. +#. #. #. @@ -26107,5 +26098,5 @@ #. 50000 #. -#. +#. #. #. @@ -26122,5 +26113,5 @@ #. 50000 #. -#. +#. #. #. @@ -26130,5 +26121,5 @@ #. 50000 #. -#. +#. #. #. @@ -26138,5 +26129,5 @@ #. 50000 #. -#. +#. #. #. @@ -26146,5 +26137,5 @@ #. 50000 #. -#. +#. #. #. @@ -26154,5 +26145,5 @@ #. 50000 #. -#. +#. #. #. @@ -26162,5 +26153,5 @@ #. 50000 #. -#. +#. #. #. @@ -26171,5 +26162,5 @@ #. 50000 #. -#. +#. #. #. @@ -26179,5 +26170,5 @@ #. 50000 #. -#. +#. #. #. @@ -26187,5 +26178,5 @@ #. 40000 #. -#. +#. #. #. @@ -26195,5 +26186,5 @@ #. 50000 #. -#. +#. #. #. @@ -26202,5 +26193,5 @@ #. 40000 #. -#. +#. #. #. @@ -26209,5 +26200,5 @@ #. 40000 #. -#. +#. #. #. @@ -26225,7 +26216,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26235,5 +26226,5 @@ #. 50000 #. -#. +#. #. #. @@ -26243,5 +26234,5 @@ #. 50000 #. -#. +#. #. #. @@ -26251,5 +26242,5 @@ #. 50000 #. -#. +#. #. #. @@ -26259,5 +26250,5 @@ #. 50000 #. -#. +#. #. #. @@ -26267,5 +26258,5 @@ #. 50000 #. -#. +#. #. #. @@ -26275,5 +26266,5 @@ #. 50000 #. -#. +#. #. #. @@ -26283,5 +26274,5 @@ #. 50000 #. -#. +#. #. #. @@ -26291,5 +26282,5 @@ #. 50000 #. -#. +#. #. #. @@ -26299,5 +26290,5 @@ #. 50000 #. -#. +#. #. #. @@ -26316,5 +26307,5 @@ #. 50000 #. -#. +#. #. #. @@ -26328,5 +26319,5 @@ #. 50000 #. -#. +#. #. #. @@ -26340,5 +26331,5 @@ #. 50000 #. -#. +#. #. #. @@ -26348,5 +26339,5 @@ #. 50000 #. -#. +#. #. #. @@ -26360,5 +26351,5 @@ #. 50000 #. -#. +#. #. #. @@ -26372,5 +26363,5 @@ #. 50000 #. -#. +#. #. #. @@ -26384,6 +26375,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26393,5 +26384,5 @@ #. 50000 #. -#. +#. #. #. @@ -26405,5 +26396,5 @@ #. 50000 #. -#. +#. #. #. @@ -26417,5 +26408,5 @@ #. 50000 #. -#. +#. #. #. @@ -26429,5 +26420,5 @@ #. 50000 #. -#. +#. #. #. @@ -26441,5 +26432,5 @@ #. 50000 #. -#. +#. #. #. @@ -26453,5 +26444,5 @@ #. 50000 #. -#. +#. #. #. @@ -26461,7 +26452,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26471,5 +26462,5 @@ #. 50000 #. -#. +#. #. #. @@ -26479,5 +26470,5 @@ #. 50000 #. -#. +#. #. #. @@ -26487,5 +26478,5 @@ #. 50000 #. -#. +#. #. #. @@ -26495,5 +26486,5 @@ #. 50000 #. -#. +#. #. #. @@ -26510,5 +26501,5 @@ #. 50000 #. -#. +#. #. #. @@ -26521,5 +26512,5 @@ #. 50000 #. -#. +#. #. #. @@ -26533,5 +26524,5 @@ #. 50000 #. -#. +#. #. #. @@ -26545,5 +26536,5 @@ #. 50000 #. -#. +#. #. #. @@ -26557,5 +26548,5 @@ #. 50000 #. -#. +#. #. #. @@ -26566,5 +26557,5 @@ #. 50000 #. -#. +#. #. #. @@ -26574,5 +26565,5 @@ #. 50000 #. -#. +#. #. #. @@ -26582,5 +26573,5 @@ #. 50000 #. -#. +#. #. #. @@ -26590,5 +26581,5 @@ #. 50000 #. -#. +#. #. #. @@ -26598,5 +26589,5 @@ #. 50000 #. -#. +#. #. #. @@ -26613,5 +26604,5 @@ #. 50000 #. -#. +#. #. #. @@ -26625,5 +26616,5 @@ #. 50000 #. -#. +#. #. #. @@ -26637,5 +26628,5 @@ #. 50000 #. -#. +#. #. #. @@ -26649,5 +26640,5 @@ #. 50000 #. -#. +#. #. #. @@ -26661,5 +26652,5 @@ #. 50000 #. -#. +#. #. #. @@ -26673,5 +26664,5 @@ #. 50000 #. -#. +#. #. #. @@ -26680,7 +26671,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26690,5 +26681,5 @@ #. 50000 #. -#. +#. #. #. @@ -26698,5 +26689,5 @@ #. 50000 #. -#. +#. #. #. @@ -26706,5 +26697,5 @@ #. 50000 #. -#. +#. #. #. @@ -26714,5 +26705,5 @@ #. 50000 #. -#. +#. #. #. @@ -26722,5 +26713,5 @@ #. 50000 #. -#. +#. #. #. @@ -26730,5 +26721,5 @@ #. 50000 #. -#. +#. #. #. @@ -26738,5 +26729,5 @@ #. 50000 #. -#. +#. #. #. @@ -26753,7 +26744,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26763,5 +26754,5 @@ #. 50000 #. -#. +#. #. #. @@ -26771,5 +26762,5 @@ #. 50000 #. -#. +#. #. #. @@ -26779,5 +26770,5 @@ #. 50000 #. -#. +#. #. #. @@ -26787,5 +26778,5 @@ #. 50000 #. -#. +#. #. #. @@ -26801,5 +26792,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26848,5 +26839,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26856,5 +26847,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26864,5 +26855,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26872,5 +26863,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26880,5 +26871,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26888,5 +26879,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26896,5 +26887,5 @@ #. 50000 #. -#. +#. #. #. @@ -26904,5 +26895,5 @@ #. 50000 #. -#. +#. #. #. @@ -26912,5 +26903,5 @@ #. 50000 #. -#. +#. #. #. @@ -26920,5 +26911,5 @@ #. 50000 #. -#. +#. #. #. @@ -26928,5 +26919,5 @@ #. 50000 #. -#. +#. #. #. @@ -26936,5 +26927,5 @@ #. 50000 #. -#. +#. #. #. @@ -26954,5 +26945,5 @@ #. 50000 #. -#. +#. #. #. @@ -26961,5 +26952,5 @@ #. 50000 #. -#. +#. #. #. @@ -26968,5 +26959,5 @@ #. 50000 #. -#. +#. #. #. @@ -26975,5 +26966,5 @@ #. 40000 #. -#. +#. #. #. @@ -26982,5 +26973,5 @@ #. 40000 #. -#. +#. #. #. @@ -26989,5 +26980,5 @@ #. 40000 #. -#. +#. #. #. @@ -27082,5 +27073,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -27088,28 +27079,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 @@ -27224,5 +27215,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27235,5 +27226,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27258,6 +27249,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27266,6 +27257,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27280,6 +27271,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 @@ -27293,6 +27284,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 @@ -27312,6 +27303,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27335,6 +27326,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 @@ -27347,4 +27338,67 @@ msgstr "" +#~ msgid "Images for {0}" +#~ msgstr "Afbeeldingen van {0}" + +#~ msgid "Read GPX..." +#~ msgstr "GPX inlezen..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Geen tijd voor punt {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen." + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Geen afbeeldingen met een leesbare tijd gevonden." + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS-start: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS-einde: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "Huidige verschil: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "Tijdzoneverschil: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} binnen de track." + +#~ msgid "Sync clock" +#~ msgstr "Klok synchroniseren" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"." + +#~ msgid "Image" +#~ msgstr "Afbeelding" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Syncroniseer tijd met GPS-apparaat" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Ingevoerde tijd kon niet worden ontleed." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Geotagged-afbeeldingen" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Afbeeldingen openen met AGPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "osmarender-optie" + #~ msgid "Select a bookmark first." #~ msgstr "Selecteer eerst een bladwijzer." @@ -27383,5 +27437,4 @@ #~ msgstr "Openen in browser" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Maak een melding bij {0}" @@ -27389,12 +27442,13 @@ #~ msgid "Include your steps to get to the error (as detailed as possible)!" #~ msgstr "" -#~ "Beschrijf de gevolgde stappen die tot de fout leidde (zo precies mogelijk)!" +#~ "Beschrijf de gevolgde stappen die tot de fout leidde (zo precies " +#~ "mogelijk)!" #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" -#~ "Probeer te updaten naar de nieuwste versie van JOSM en alle plugins voordat " -#~ "je de fout meldt." +#~ "Probeer te updaten naar de nieuwste versie van JOSM en alle plugins " +#~ "voordat je de fout meldt." #~ msgid "Be sure to include the following information:" @@ -27405,6 +27459,6 @@ #~ "some time." #~ msgstr "" -#~ "Server antwoordde met interne fout. Verklein het gebied of probeer het later " -#~ "nog eens." +#~ "Server antwoordde met interne fout. Verklein het gebied of probeer het " +#~ "later nog eens." #~ msgid "Found element in non-way." @@ -27423,5 +27477,4 @@ #~ msgstr "Verzending is afgebroken vanwege een fout (zal 5 seconden wachten):" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Plugin vereist JOSM-update: {0}" @@ -27431,18 +27484,16 @@ #~ "setting the config option 'pluginmanager.warntime'.)" #~ msgstr "" -#~ "(Je kunt het aantal dagen waarna deze waarschuwing verschijnt
instellen " -#~ "via de configuratieoptie 'pluginmanager.warntime'.)" +#~ "(Je kunt het aantal dagen waarna deze waarschuwing " +#~ "verschijnt
instellen via de configuratieoptie 'pluginmanager." +#~ "warntime'.)" #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "" -#~ "Tip: enkele wijzigingen zijn afkomstig uit het uploaden van nieuwe gegevens " -#~ "naar de server." +#~ "Tip: enkele wijzigingen zijn afkomstig uit het uploaden van nieuwe " +#~ "gegevens naar de server." #~ msgid "Unsaved Changes" #~ msgstr "Niet-opgeslagen wijzigingen" -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Voer eerst de gewenste coördinaten in." - #~ msgid "Contacting the OSM server..." #~ msgstr "Met OSM-server verbinden..." @@ -27482,6 +27533,6 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" #~ "De staat van alle geselecteerde objecten terugdraaien naar de versie " @@ -27494,12 +27545,7 @@ #~ msgstr "site-josm.xml of Wiki-paginas toevoegen." -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Fout tijdens verwijderen plugin-bestand: {0}" - #~ msgid "Plugin already exists" #~ msgstr "Plugin bestaat al" -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Kan plugin niet downloaden: {0} van {1}" @@ -27508,8 +27554,4 @@ #~ msgstr "Bestand niet gevonden" -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "{1} {0} verwijderen" - #~ msgid "Conflicting relation" #~ msgstr "Conflicterende relatie" @@ -27525,6 +27567,6 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" #~ "Interne fout: kan voorwaarden voor geen laag niet controleren. Rapporteer " @@ -27532,9 +27574,9 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "De geselecteerde knopen behoren tot verschillende relaties. Wil je ze toch " -#~ "samenvoegen?" +#~ "De geselecteerde knopen behoren tot verschillende relaties. Wil je ze " +#~ "toch samenvoegen?" #~ msgid "Merge nodes with different memberships?" @@ -27550,11 +27592,10 @@ #~ msgstr "Selecteer wegen met nagenoeg rechte hoeken om orthogonaal te maken." -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" #~ "De plugin {0} lijkt beschadigd of kan niet automatisch worden gedownload." -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27573,5 +27614,4 @@ #~ msgstr "Naar OSM uploaden..." -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -27580,6 +27620,6 @@ #~ "{0}" #~ msgstr "" -#~ "Plugin-archief is al beschikbaar. Wil je de huidige versie downloaden door " -#~ "de bestaande te verwijderen?\n" +#~ "Plugin-archief is al beschikbaar. Wil je de huidige versie downloaden " +#~ "door de bestaande te verwijderen?\n" #~ "\n" #~ "{0}" @@ -27609,5 +27649,4 @@ #~ msgstr "Afbeeldings-id Metacarta Map Rectifier" -#, java-format #~ msgid "rectifier id={0}" #~ msgstr "rectifier-id={0}" @@ -27618,6 +27657,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -27634,6 +27673,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example,replacing 73 with your image id: \n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -27642,9 +27681,9 @@ #~ "use." #~ msgstr "" -#~ "Je kunt WMS-invoer in het tabblad WMSplugin-voorkeuren toevoegen, bewerken " -#~ "en wissen - deze zullen in het WMS-menu getoond worden.\n" +#~ "Je kunt WMS-invoer in het tabblad WMSplugin-voorkeuren toevoegen, " +#~ "bewerken en wissen - deze zullen in het WMS-menu getoond worden.\n" #~ "\n" -#~ "Je kunt dit ook handmatig doen in de Uitgebreide voorkeuren, gebruikmakend " -#~ "van het volgende schema:\n" +#~ "Je kunt dit ook handmatig doen in de Uitgebreide voorkeuren, " +#~ "gebruikmakend van het volgende schema:\n" #~ "wmsplugin.url.1.name=Landsat\n" #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" @@ -27658,12 +27697,12 @@ #~ "Voor de Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) " #~ "moet je de betreffende 'id' invoeren.\n" -#~ "Om een menuitem van Metacarta Map Rectifier toe te voegen, maak je een URL " -#~ "volgens het volgende voorbeeld, waarbij 73 vervangen wordt door je eigen " -#~ "afbeeldings-id: \n" +#~ "Om een menuitem van Metacarta Map Rectifier toe te voegen, maak je een " +#~ "URL volgens het volgende voorbeeld, waarbij 73 vervangen wordt door je " +#~ "eigen afbeeldings-id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" #~ " \n" -#~ "Merk op: Weet zeker dat de afbeelding vrij is van copyrights. Bij twijfel: " -#~ "niet gebruiken." +#~ "Merk op: Weet zeker dat de afbeelding vrij is van copyrights. Bij " +#~ "twijfel: niet gebruiken." #~ msgid "OSM username (email)" @@ -27672,6 +27711,6 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" #~ "WAARSCHUWING: het wachtwoord wordt als gewone tekst in het " @@ -27711,13 +27750,10 @@ #~ "Opent het OpenStreetBugs-scherm en activeert de automatische download" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Auteurs: {0}" -#, java-format #~ msgid "Layers: {0}" #~ msgstr "Lagen: {0}" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Conflicten: {0}" @@ -27730,6 +27766,7 @@ #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." #~ msgstr "" -#~ "De bronnen (URL of bestandsnaam) van bestanden met tagvoorkeuzedefinities. " -#~ "Zie http://josm.openstreetmap.de/wiki/TaggingPresets voor hulp." +#~ "De bronnen (URL of bestandsnaam) van bestanden met " +#~ "tagvoorkeuzedefinities. Zie http://josm.openstreetmap.de/wiki/" +#~ "TaggingPresets voor hulp." #~ msgid "Add a new tagging preset source to the list." @@ -27739,5 +27776,4 @@ #~ msgstr "Bronnen tagvoorkeuzen" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Kan voorkeurenmap niet openen: {0}" @@ -27789,14 +27825,13 @@ #~ msgstr "onwaar" -#, java-format #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "Los {0} conflicten in {1} objecten op" #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" -#~ "De geselecteerde wegen zijn onderdeel van niet verschillende relaties. Weet " -#~ "u zeker dat u ze wilt combineren?" +#~ "De geselecteerde wegen zijn onderdeel van niet verschillende relaties. " +#~ "Weet u zeker dat u ze wilt combineren?" #~ msgid "Combine ways with different memberships?" @@ -27827,13 +27862,10 @@ #~ msgstr "Kan alleen hulppagina's van JOSM Online-hulp bewerken" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Fout tijdens het laden van {0}" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Voorkeuze ''{0}'' gebruiken" @@ -27845,5 +27877,4 @@ #~ msgstr "Loginnaam (e-mail) van het OSM-account." -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27860,5 +27891,4 @@ #~ msgstr "samengevoegde versie:" -#, java-format #~ msgid "requested: {0}" #~ msgstr "verzocht: {0}" @@ -27906,5 +27936,4 @@ #~ msgstr "bord" -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Een weg overslaan omdat het een niet bestaande knoop bevat: {0}\n" @@ -27953,19 +27982,17 @@ #~ 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 "" -#~ "Een speciale bewerker van de Franse kadaster WMS op " -#~ "www.cadastre.gouv.fr

Lees de gebruiksvoorwaarden (in het Frans): " -#~ "
" -#~ "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " -#~ "
voor het uploaden van gegevens die met deze plugin zijn gemaakt." +#~ "Een speciale bewerker van de Franse kadaster WMS op www.cadastre.gouv." +#~ "fr

Lees de gebruiksvoorwaarden (in het Frans):
http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr." +#~ "html
voor het uploaden van gegevens die met deze plugin zijn " +#~ "gemaakt." #~ msgid "sports" @@ -27984,5 +28011,4 @@ #~ msgstr "Omlaag bewegen" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Relatie-editor: {0}" @@ -28007,15 +28033,14 @@ #~ msgstr "Toch samenvoegen" -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " #~ "continue?" #~ msgstr "" -#~ "Deze opdracht zal {0} individuele downloadverzoeken vereisen. Toch doorgaan?" +#~ "Deze opdracht zal {0} individuele downloadverzoeken vereisen. Toch " +#~ "doorgaan?" #~ msgid "Update Data" #~ msgstr "Gegevens bijwerken" -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "Verander eerste de projectie in {0}." @@ -28035,6 +28060,6 @@ #~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You can " -#~ "adjust the sliders to manually match the photos." +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." #~ msgstr "" #~ "Het koppelen van de foto's aan de GPX-track is mislukt. Je kunt de " @@ -28042,8 +28067,9 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" -#~ "Geen gegevens gevonden om te updaten. Heeft u al een gegevenslaag geopend of " -#~ "gedownload?" +#~ "Geen gegevens gevonden om te updaten. Heeft u al een gegevenslaag geopend " +#~ "of gedownload?" #~ msgid "Edit Drawbridge" @@ -28053,5 +28079,4 @@ #~ msgstr "Valhek bewerken" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" Index: /applications/editors/josm/i18n/po/pl.po =================================================================== --- /applications/editors/josm/i18n/po/pl.po (revision 18974) +++ /applications/editors/josm/i18n/po/pl.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:52+0000\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-12-03 11:07+0000\n" "Last-Translator: Piotr Strębski \n" "Language-Team: Polish \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:05+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -33,6 +33,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 @@ -49,7 +49,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 @@ -65,19 +65,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 @@ -90,9 +89,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" @@ -120,5 +119,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 @@ -141,9 +140,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 @@ -159,20 +158,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 @@ -191,7 +186,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 "Błąd" @@ -271,5 +266,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 "Wtyczki" @@ -310,4 +305,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 @@ -315,8 +312,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 @@ -326,29 +323,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 @@ -377,6 +372,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 "" "Nie ma warstw, z którymi można by połączyć warstwę " @@ -430,14 +425,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 "Szerokość" #: ../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 "Długość" @@ -463,10 +458,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 @@ -497,19 +492,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 @@ -518,9 +516,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 @@ -536,7 +531,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 @@ -548,11 +543,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" @@ -640,5 +635,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}" @@ -693,10 +688,10 @@ "węzłów)" -#: ../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 "Połącz {0} dróg" -#: ../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 "Wybierz co najmniej dwie drogi do połączenia." @@ -715,19 +710,19 @@ msgstr "Proszę wybrać coś do skopiowania." +#: ../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 "Utwórz okrąg" -#: ../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 "Tworzy okrąg na podstawie trzech zaznaczonych węzłów." -#: ../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 "Te węzły nie są wewnąrz koła. Porzucam." -#: ../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 " @@ -740,9 +735,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 @@ -816,21 +811,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" @@ -838,6 +837,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 @@ -866,5 +865,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 "Powiel" @@ -921,8 +920,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 @@ -930,5 +927,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 @@ -941,8 +938,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 @@ -961,8 +958,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 @@ -985,13 +982,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 @@ -1031,4 +1029,100 @@ msgstr "Wyświetl informacje obiektowe o węźle, drodze lub relacji OSM." +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "Połącz nakładające się obszary" + +#: ../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 "Podaj wartości dla wszystkich konfliktów." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Rozwiąż konflikty" + +#: ../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 @@ -1048,4 +1142,45 @@ msgstr "Brak skrótu" +#: ../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" @@ -1056,26 +1191,26 @@ msgstr "Włącz aktualną warstwę do innej." +#: ../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 "Połącz węzły" -#: ../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 "Scala wybrane węzły z najstarszym." -#: ../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 "Proszę wybierz przynajmniej dwa węzły aby scalić." -#: ../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 "" @@ -1083,5 +1218,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" @@ -1457,6 +1592,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 "" "Pokazuje raport zawierający użyteczne informacje, które mogą być dołączone " @@ -1478,9 +1612,42 @@ #: ../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 "Zamknij" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Uprość drogę" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Usuwa zbędne węzły z drogi." + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "Proszę zaznaczyć przynajmniej jedną drogę do uproszczenia." + +#: ../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 "Czy na pewno?" + +#: ../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] "Uprość drogę (usuń {0} wezłów)" +msgstr[1] "Uprość drogę (usuń {0} węzeł)" +msgstr[2] "Uprość drogę (usuń {0} węzly)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1608,6 +1775,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 "" "* Jeden węzeł, który jest użyty przez więcej niż jedną drogę oraz jedną z " @@ -1689,54 +1855,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 "Nie znaleziono aktualnego zestawu danych" -#: ../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 "Nie znalazłem obiektu o id {0} w zestawie danych." -#: ../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 "Aktualizuj zaznaczenie" +#: ../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 "Wybrano zbiór pusty." -#: ../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 "Wysyłam dane" -#: ../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 "" @@ -1744,38 +1910,38 @@ "resolve them first." msgstr "" -"Powstały nierozwiązywalne automagicznie konflikty w warstwie " -"''{0}''.
Musisz je najpierw rozwiązać." - -#: ../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 +"Powstały nierozwiązywalne automagicznie konflikty w warstwie ''{0}''." +"
Musisz je najpierw rozwiązać." + +#: ../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 "Brak zmian do wysłania." -#: ../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 "Nie ma nic do wysłania. Wprowadź jakieś dane." -#: ../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 "Synchronizuję tylko węzeł {0}" -#: ../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 "Synchronizuję tylko drogę {0}" -#: ../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 "Synchronizuję tylko relację {0}" -#: ../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 "Synchronizuj cały zestaw danych" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1783,28 +1949,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 "Wykryto konflikty" -#: ../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 "" @@ -1814,22 +1978,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 msgid "Changeset closed" msgstr "Zamknięto changeset" -#: ../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 "Kliknij aby przerwać i powrócić do edycji." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 #, java-format msgid "" @@ -1840,15 +2004,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 "Odświeżam element" @@ -1860,6 +2024,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 "" @@ -1868,38 +2032,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 "Wyślij wybrane elementy" -#: ../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 "" @@ -2063,6 +2226,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 "" @@ -2131,38 +2294,38 @@ msgstr "zaznaczony" -#: ../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 "Nie można dodać węzła poza granicami świata." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Dodaj węzeł" -#: ../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 "Dodaj węzeł do drogi" -#: ../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 "Połącz istniejący drogę z węzłem" -#: ../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 "Dodaj nowy węzeł do istniejącej drogi" -#: ../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 "Dodaj węzeł do drogi i połącz" -#: ../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 "Utwórz nowy węzeł." -#: ../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 "Zaznacz węzeł pod kursorem." -#: ../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." @@ -2171,14 +2334,14 @@ msgstr[1] "Wstaw w drogę nowe węzły {0}" -#: ../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 "Zacznij nową drogę od ostatniego węzła" -#: ../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 "Kontynuuj drogę od ostatniego węzła." -#: ../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 "Zakończ rysowanie." @@ -2213,6 +2376,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 "" @@ -2300,6 +2463,6 @@ "move zoom with right button" msgstr "" -"Powiększaj przeciągając lub przez Ctrl+. lub Ctrl+,; przesuwanie - " -"Ctrl+góra, lewo, dół, prawo; przesuń powiększenie prawym przyciskiem" +"Powiększaj przeciągając lub przez Ctrl+. lub Ctrl+,; przesuwanie - Ctrl" +"+góra, lewo, dół, prawo; przesuń powiększenie prawym przyciskiem" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 @@ -2314,5 +2477,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,6 +2521,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Baker Street\" - 'Baker Street' w dowolnym kluczu lub nazwie." +msgstr "\"Baker Street\" - 'Baker Street' w dowolnym kluczu lub nazwie." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 @@ -2398,12 +2560,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - wszystkie obiekty zmienione przez użytkownika" + +#: ../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 "nodes:... - obiekt z podaną liczbą węzłów" -#: ../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-" @@ -2411,43 +2578,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 "modified - wszystkie zmienione obiekty" -#: ../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 "selected - wszystkie zaznaczone obiekty" -#: ../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 "incomplete - wszystkie niekompletne obiekty" -#: ../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 "untagged - wszystkie obiekty bez tagów" -#: ../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 "Użyj I lub OR by połączyć logicznym \"lub\"" -#: ../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 "Użyj \" aby wpisać operator (np.: jeżeli klucz zawiera :)" -#: ../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 "Użyj ( oraz ) aby pogrupować wyrażenia" -#: ../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 @@ -2457,55 +2624,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 "Szukaj" -#: ../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 "Rozpocznij szukanie" -#: ../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 "Nie znaleziono nic szukając ''{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 "Niczego nie dodano do zaznaczenia szukając \"{0}\"" -#: ../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 "Niczego nie usunięto z zaznaczenia szukając \"{0}\"" -#: ../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 "Znaleziono {0} pasujących." -#: ../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 "" @@ -2515,40 +2682,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 "Brak argumentów dla operator lub." -#: ../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 "Brak argumentu dla operatora nie." -#: ../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 "Brak nawiasu zamykającego." -#: ../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 "" @@ -2557,9 +2724,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 "" @@ -2568,5 +2735,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." @@ -2619,6 +2786,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 "" @@ -2626,5 +2792,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 "" @@ -2761,5 +2927,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 "" @@ -2778,5 +2944,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 "" @@ -2795,19 +2962,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" @@ -2816,5 +2983,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" @@ -2823,5 +2990,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" @@ -2830,5 +2997,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" @@ -2839,10 +3006,10 @@ #. 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?" +#: ../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 "" "Zamierzasz usunąć węzły spoza obszaru, który pobrano.
Może to spowodowac " @@ -2850,5 +3017,5 @@ "węzłów.
Czy naprawdę zamierzasz je usunąć?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "Potwierdź usunięcie." @@ -2866,15 +3033,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 "" @@ -2883,5 +3050,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}" @@ -2891,9 +3058,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 "" @@ -2973,5 +3135,5 @@ msgstr "Zastosować?" -#: ../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 " @@ -3116,6 +3278,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 "" @@ -3198,5 +3360,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3205,5 +3367,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3211,25 +3373,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 "S" #. 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 "N" #. 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 "W" #. 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 "E" #: ../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 @@ -3252,25 +3414,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}" @@ -3278,6 +3441,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 "" @@ -3340,24 +3503,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 " @@ -3365,5 +3528,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 "" @@ -3395,6 +3558,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}." @@ -3415,5 +3578,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 @@ -3425,6 +3587,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 "" @@ -3435,135 +3596,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 "" +#: ../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 "" + +#: ../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 "" + +#: ../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:557 +msgid "More than one \"to\" way found." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:922 -#, java-format -msgid "Deleted member ''{0}'' in relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:930 -#, java-format -msgid "Way ''{0}'' with less than two points." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -msgid "More than one \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 -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: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 "Nieznana rola \"{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 "" -#: ../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:832 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "" + +#: ../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:891 #, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:903 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950 -#, 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 "nieotagowany" -#: ../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 "tekst" -#: ../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 "Błąd: {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}" @@ -3575,5 +3736,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 @@ -3594,5 +3755,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 @@ -3613,5 +3774,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 "tło" @@ -3729,6 +3890,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 "" @@ -3743,5 +3903,5 @@ msgstr "Nie pokazuj ponownie" -#: ../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 @@ -3749,32 +3909,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 "niekompletne" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "droga" -#: ../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 "tory kolejowe" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "szlak wodny" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "zagospodarowanie przestrzenne" -#: ../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" @@ -3784,5 +3944,5 @@ msgstr[2] "{0} węzłów" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -4024,12 +4184,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Plik" -#: ../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 @@ -4043,19 +4203,19 @@ msgstr "Edycja" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Widok" -#: ../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 "Narzędzia" -#: ../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 "Szablony" -#: ../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 @@ -4066,5 +4226,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Dźwięk" @@ -4108,29 +4268,29 @@ msgstr "skala" -#: ../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 "Długość geograficzna punktu wskazywanego przez kursor." -#: ../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 "Nazwa obiektu wskazywanego przez kursor." -#: ../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 "Szerokość geograficzna punktu wskazywanego przez kursor." -#: ../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 "Kąt pomiędzy poprzednim i bieżącym segmentem tworzonej drogi." -#: ../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 "Namiar (kompasowy) tworzonego odcinka." -#: ../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 "Długość nowego, tworzonego odcinka." -#: ../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 " @@ -4138,9 +4298,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(brak obiektu)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "" @@ -4171,6 +4331,5 @@ msgid "" "partial: different selected objects have different values, do not change" -msgstr "" -"częściowe: różne zaznaczone obiekty mają różne wartości - nie zmienia" +msgstr "częściowe: różne zaznaczone obiekty mają różne wartości - nie zmienia" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101 @@ -4247,5 +4406,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" @@ -4254,5 +4413,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" @@ -4261,5 +4420,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" @@ -4278,5 +4437,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 @@ -4293,5 +4452,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" @@ -4363,22 +4522,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." @@ -4457,6 +4616,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 "" @@ -4525,6 +4683,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" @@ -4532,6 +4690,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" @@ -4588,6 +4746,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 "" @@ -4620,7 +4778,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 "" @@ -4766,5 +4924,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 "" @@ -4899,5 +5057,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 "" @@ -4997,7 +5155,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" @@ -5008,6 +5166,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" @@ -5042,7 +5200,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 "" @@ -5131,5 +5287,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 @@ -5194,10 +5350,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 "" @@ -5272,18 +5427,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 "Historia" -#: ../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 "Wyświetla historię wszystkich zaznaczonych elementów." -#: ../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 @@ -5293,13 +5448,13 @@ msgstr "Odśwież" -#: ../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 "Ponownie wczytuje wszystkie zaznaczone obiekty i odświeża listę." -#: ../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 "" @@ -5494,5 +5649,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 "" @@ -5535,25 +5690,25 @@ msgstr "Powiększ do zaznaczenia" -#: ../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 "Zazn.: Rel.:{0} / Drogi:{1} / Węzły:{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 "Zaznaczenie" -#: ../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 "Zaznaczenie: {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 "Oderwij panel" -#: ../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." @@ -5561,5 +5716,5 @@ "Zamknij panel. Możesz ponownie go otworzyć używając przycisków po lewej." -#: ../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 "Kliknij aby zminimalizować/maksymalizować zawartość panela" @@ -5619,37 +5774,37 @@ msgstr "Liczba obiektów" -#: ../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 "" @@ -5658,63 +5813,92 @@ 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] "Pobierz wszystkie niekompletne drogi i węzły w relacji" +msgstr[1] "Pobierz wszystkie niekompletne drogi i węzły w relacji" +msgstr[2] "Pobierz wszystkie niekompletne drogi i węzły w relacji" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Pobierz dane." + +#: ../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 "Zastosuj szablon" + +#: ../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 "Otwiera okno edycji dla zaznaczonej relacji." + +#: ../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 "" @@ -5724,15 +5908,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 " @@ -5740,5 +5924,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 " @@ -5746,20 +5930,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 "" @@ -5768,66 +5952,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 "Sport" + +#: ../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 "Przesuń aktualnie zaznaczonych członkół w górę" #. 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 "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii." #. 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 " @@ -5836,53 +6024,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 "Pobierz wszystkie niekompletne drogi i węzły w relacji" -#: ../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 "Pobierz członków" -#: ../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 "" @@ -5892,41 +6086,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 "" @@ -5966,19 +6153,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 "Zastosuj zmiany" -#: ../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}''" @@ -5990,6 +6177,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 "" @@ -6170,7 +6356,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 "" @@ -6943,5 +7128,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 @@ -7178,6 +7363,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 "" @@ -7187,6 +7372,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 "" @@ -7449,13 +7634,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}" @@ -7556,6 +7741,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 "" @@ -7640,6 +7824,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] "" @@ -7653,6 +7837,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 " @@ -7707,5 +7891,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 " @@ -7713,5 +7897,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 "" @@ -7784,40 +7968,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 "Ustawienia" -#: ../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 "Obiekty do dodania:" -#: ../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 "Obiekty do zmiany:" -#: ../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 "Obiekty do usunięcia:" -#: ../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:" @@ -7826,5 +8010,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:" @@ -7833,5 +8017,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:" @@ -7840,68 +8024,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 "Wyślij zmiany" -#: ../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 "Proszę wcześniej podać wybrane współrzędne." + +#: ../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 "Dołącz krótki opis zmian, które wysyłasz do serwera:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../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}" @@ -7909,16 +8092,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}." @@ -7926,6 +8109,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 "" @@ -7934,5 +8117,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 "" @@ -7962,112 +8145,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Obrazy dla {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "Wczytaj GPX..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Brak znacznika czasowego dla punktu {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 "Nie można odczytać czasu \"{0}\" w punkcie {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 "Wczytywanie {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym" - -#: ../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 "Geolokalizowane obrazy" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "GPS początek: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "GPS koniec: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "aktualne przesunięcie: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "różnica stref czasowych: " - -#: ../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] "obraz" -msgstr[1] "obrazy" -msgstr[2] "obrazów" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} wewnątrz ścieżki GPS." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Synchronizuj zegar" - -#: ../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 "Pliki JPEG (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Obraz" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Synchronizuj czas z urządzeniem GPS" - -#: ../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 "Podany czas nie został rozpoznany." - -#: ../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} metrów" +msgstr[1] "{0} metrów" +msgstr[2] "{0} metrów" + +#: ../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 "Podaj nazwę użytkownika" + +#: ../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 @@ -8075,30 +8202,30 @@ msgstr "punkt 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 "Dostosuj rysowanie linii" -#: ../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 "Użyj ustawień globalnych." -#: ../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 "Rysuj linie pomiędzy punktami na tej warstwie." -#: ../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 "Nie rysuj linii pomiędzy punktami na tej warstwie." -#: ../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 "Wybierz opcje rysowania linii" -#: ../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 @@ -8106,5 +8233,5 @@ msgstr "Dostosuj kolor" -#: ../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 @@ -8113,5 +8240,5 @@ msgstr "Domyślny" -#: ../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 @@ -8120,58 +8247,63 @@ msgstr "Wybierz kolor" -#: ../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 "Znaczniki nazwanych punktów" -#: ../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 "Nazwane punkty GPS z {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215 msgid "Import Audio" msgstr "Importuj dźwięk" -#: ../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 "Pliki audio Wave (*.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 "Markery audio z {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 "Importuj obrazki" -#: ../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 "Pliki JPEG (*.jpg)" + +#: ../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 "Nazwa: {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 @@ -8179,5 +8311,5 @@ msgstr "Opis: {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" @@ -8187,5 +8319,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 @@ -8193,22 +8325,17 @@ msgstr "Opis" -#: ../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 "Długość: " -#: ../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, " @@ -8218,5 +8345,5 @@ msgstr[2] "{0} tras, " -#: ../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" @@ -8226,24 +8353,24 @@ msgstr[2] "{0} punktów" -#: ../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 "Przekształć w warstwę danych" -#: ../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:" +#: ../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 "" "Wysyłanie nieprzetworzonych danych GPS jako danych mapy jest uznawane " "za niebezpieczne.
Jeśli chcesz wysłać same ślady zajrzyj tu:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8253,29 +8380,29 @@ msgstr "Przekonwertowany z: {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 "Pobierz dane OSM wzdłuż tej ścieżki" -#: ../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 "Pobierz wszystko pomiędzy:" -#: ../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} metrów" -#: ../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 "Maksymalny obszar na zapytanie:" -#: ../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} km kw." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8283,8 +8410,8 @@ "wish
to continue?" msgstr "" -"Ta akcja będzie wymagała {0} osobnych pobrań.
Czy " -"kontynuować?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 +"Ta akcja będzie wymagała {0} osobnych pobrań.
Czy kontynuować?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 msgid "No GPX track available in layer to associate audio with." msgstr "" @@ -8292,5 +8419,5 @@ "danymi dźwiękowymi." -#: ../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 " @@ -8298,5 +8425,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 " @@ -8304,23 +8431,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 "Warstwa danych {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 "poza pobranym obszarem" -#: ../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." @@ -8329,5 +8456,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 "" @@ -8341,5 +8468,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 "" @@ -8352,11 +8479,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" @@ -8365,32 +8492,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 "Obiekty na warstwie {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 "" @@ -8398,6 +8525,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 "" @@ -8440,4 +8567,350 @@ msgstr[2] "{0} punktów" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "Pliki GPX (*.gpx *.gpx.gz)" + +#: ../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 "Błąd podczas przetwarzania {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Nie można odczytać \"{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 " [dd/mm/yyyy hh:mm:ss]" + +#: ../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 "Brak daty" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "Otwórz inne zdjęcie" + +#: ../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 "" +"Błąd w trakcie przetwarzania daty.\n" +"Proszę użyć wybranego formatu." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "Nieprawidłowa data" + +#: ../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 "Scieżka GPX: " + +#: ../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 "Strefa czasowa: " + +#: ../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 "Aktualizuj pozycję dla: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 +msgid "All images" +msgstr "Wszystkie obrazy" + +#: ../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 "Nieprawidłowa strefa czasowa" + +#: ../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 "Ślad GPX wczytany" + +#: ../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 "Pobieranie lokalizacji GPS z EXIF" + +#: ../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 "Wczytywanie {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 "Przeglądanie katalogu {0}" + +#: ../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 "Bład w czasie pobierania obrazów z katalogu {0}\n" + +#: ../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 "Geolokalizowane obrazy" + +#: ../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] "obraz" +msgstr[1] "obrazy" +msgstr[2] "obrazów" + +#: ../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 "Brak obrazu" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "Wczytywanie {0}" + +#: ../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 "Błąd w pliku {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Geolokalizowane obrazy" + +#: ../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 "Usuń zdjęcie z warstwy" + +#: ../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 "Wyśrodkuj widok" + +#: ../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 "" +"\n" +"Wysokość: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8535,6 +9008,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Setting Preference entries directly. Use with caution!" -msgstr "" -"Bezpośrednie, ręczne ustawianie preferencji. Należy używać ostrożnie!" +msgstr "Bezpośrednie, ręczne ustawianie preferencji. Należy używać ostrożnie!" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 @@ -8740,5 +9212,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 @@ -8774,6 +9246,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47 msgid "Dilution of Position (red = high, green = low, if available)" -msgstr "" -"Dokładność pozycji (czerwony = duża, zielony = niska, jeśli dostępne)" +msgstr "Dokładność pozycji (czerwony = duża, zielony = niska, jeśli dostępne)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48 @@ -8935,6 +9406,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 "" "Rysuje strzałki kierunkowe korzystając z przygotowanych wartości zamiast " @@ -8996,6 +9466,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 "" @@ -9064,19 +9533,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 "Wygląd i zachowanie" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Język" + +#: ../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 "Domyślny (ustalony automatycznie)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Język" - -#: ../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 @@ -9337,6 +9806,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 "" @@ -9399,6 +9868,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 "" @@ -9411,9 +9880,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 "" @@ -9437,6 +9905,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 "" @@ -9529,5 +9997,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 "Więcej informacji na temat tej funkcji" @@ -9615,5 +10083,5 @@ msgstr "Pobieranie punktów od {0} do {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 @@ -9621,5 +10089,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9742,14 +10210,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 @@ -9777,24 +10244,32 @@ 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] "Pobieranie punktów od {0} do {1}..." +msgstr[1] "Pobieranie punktów od {0} do {1}..." +msgstr[2] "Pobieranie punktów od {0} do {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9836,27 +10311,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 "" @@ -9864,66 +10339,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 "Zamykanie zestawu zmian..." -#: ../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 "Przygotowywanie..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Wysyłanie..." -#: ../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}." @@ -9958,5 +10433,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}''." @@ -9983,5 +10458,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}." @@ -9989,5 +10464,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}" @@ -10000,5 +10475,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}''." @@ -10056,7 +10531,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 "" @@ -10084,6 +10559,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 "" @@ -10149,46 +10624,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 "" @@ -10196,19 +10670,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 "Niekompletny opis z ref=0" -#: ../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 "Niedozwolony obiekt z 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 "" @@ -10218,8 +10692,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 "" @@ -10229,25 +10703,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 "" @@ -10255,5 +10729,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10262,5 +10736,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10268,5 +10742,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10275,13 +10749,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 "Przygotowywanie danych OSM..." -#: ../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 "" @@ -10334,4 +10808,10 @@ msgid "Contacting Server..." msgstr "Łączenie z serwerem..." + +#: ../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 @@ -10371,42 +10851,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 "" @@ -10447,17 +10928,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 "Usuń {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Błąd podczas usuwania wtyczki: {0}" + +#: ../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}." @@ -10469,19 +10960,18 @@ msgstr "Wystąpił błąd we wtyczce {0}" -#: ../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" @@ -10490,50 +10980,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 "Ostatnia aktualizacja wtyczek odbyła się przed {0} dniami." -#: ../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 "Nie znaleziono wtyczki {0} wymaganej przez wtyczkę {1}." -#: ../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 "Nie znaleziono wtyczki: {0}." -#: ../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 "Nie można załadować wtyczki {0}. Czy usunąć ją z preferencji?" -#: ../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 "Zablokuj wtyczkę" -#: ../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 " @@ -10543,22 +11033,22 @@ "uprawnienia aby nadpisać istniejące pliki." -#: ../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 "" "An unexpected exception occurred that may have come from the ''{0}'' plugin." msgstr "" -"Wystąpił niespodziewany błąd, który mógł być spowodowany przez wtyczkę " -"\"{0}\"." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318 +"Wystąpił niespodziewany błąd, który mógł być spowodowany przez wtyczkę \"{0}" +"\"." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:319 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Zgodnie z informacją zawartą w tej wtyczce jej autorem jest {0}." -#: ../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." @@ -10567,9 +11057,9 @@ "błędu." -#: ../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 "Czy ta wtyczka ma zostać zablokowana?" -#: ../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 " @@ -10579,13 +11069,13 @@ "JOSM , aby wyładować wtyczkę." -#: ../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" @@ -10705,6 +11195,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 "" @@ -10742,6 +11232,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 "" @@ -10803,7 +11293,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 "" @@ -10815,7 +11304,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 "" @@ -10847,6 +11336,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 "" @@ -11105,5 +11594,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" @@ -11118,12 +11607,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 @@ -11131,447 +11618,144 @@ 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 "Numer" + +#. 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 "węglowa" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "obraz" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "wypożyczalnia" + +#: ../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 "wewnętrzny segment" + +#: ../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 "AgPifoJ - Geotagowane obrazy" - -#: ../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 "Usuń zdjęcie z warstwy" - -#: ../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 "Wyśrodkuj widok" - -#: ../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 "" -"\n" -"Wysokość: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/h" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "Pobieranie lokalizacji GPS z EXIF" - -#: ../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 "Przeglądanie katalogu {0}" - -#: ../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 "Bład w czasie pobierania obrazów z katalogu {0}\n" - -#: ../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 "Otwórz obrazy za pomocą AgPifoJ..." - -#: ../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 "Pliki GPX (*.gpx *.gpx.gz)" - -#: ../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 "Błąd podczas przetwarzania {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Nie można odczytać \"{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 " [dd/mm/yyyy hh:mm:ss]" - -#: ../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 "Brak daty" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "Otwórz inne zdjęcie" - -#: ../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 "" -"Błąd w trakcie przetwarzania daty.\n" -"Proszę użyć wybranego formatu." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "Nieprawidłowa data" - -#: ../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 "Scieżka GPX: " - -#: ../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 "Strefa czasowa: " - -#: ../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 "Aktualizuj pozycję dla: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Wszystkie obrazy" - -#: ../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 "Nieprawidłowa strefa czasowa" - -#: ../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 "Ślad GPX wczytany" - -#: ../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 "Brak obrazu" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "Wczytywanie {0}" - -#: ../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 "Błąd w pliku {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11715,11 +11899,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 "" @@ -11741,6 +11924,5 @@ "Replace the original white background by the backgound color defined in JOSM " "preferences." -msgstr "" -"Zastąp oryginalne białe tło kolorem zdefiniowanym w ustawieniach JOSM." +msgstr "Zastąp oryginalne białe tło kolorem zdefiniowanym w ustawieniach JOSM." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91 @@ -12026,13 +12208,4 @@ msgid "Export as PNG format (only raster images)" 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] "Uprość drogę (usuń {0} wezłów)" -msgstr[1] "Uprość drogę (usuń {0} węzeł)" -msgstr[2] "Uprość drogę (usuń {0} węzly)" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 @@ -12145,14 +12318,14 @@ msgstr "Schematy kolorów" -#: ../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 " @@ -12460,4 +12633,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" @@ -12501,18 +12678,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" @@ -12561,7 +12738,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12571,5 +12748,5 @@ #. 50000 #. -#. +#. #. #. @@ -12579,5 +12756,5 @@ #. 50000 #. -#. +#. #. #. @@ -12586,5 +12763,5 @@ #. 50000 #. -#. +#. #. #. @@ -12594,5 +12771,5 @@ #. 50000 #. -#. +#. #. #. @@ -12670,6 +12847,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 "" @@ -12688,7 +12864,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 "" @@ -12750,20 +12925,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 "Łączenie" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Połączony" -#. 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 "Nie połączony" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "Połączenie nie powiodło się" @@ -12982,6 +13156,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 "" @@ -13064,9 +13237,10 @@ msgstr "Nieznane rozszerzenie pliku: {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 "Osmarender" -#: ../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 " @@ -13076,9 +13250,5 @@ "Ustawienia mapy w ustawieniach programu." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "opcje osmarender" - -#: ../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 "Ścieżka do programu Firefox" @@ -13451,17 +13621,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 "" @@ -13505,160 +13675,4 @@ msgid "Optional" msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "Połącz nakładające się obszary" - -#: ../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 "Podaj wartości dla wszystkich konfliktów." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Rozwiąż konflikty" - -#: ../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 "Uprość drogę" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Usuwa zbędne węzły z drogi." - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "Proszę zaznaczyć przynajmniej jedną drogę do uproszczenia." - -#: ../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 "Czy na pewno?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13756,5 +13770,5 @@ msgstr "pozostałe informacje z sprawdzania poprawności" -#: ../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}" @@ -13807,34 +13821,34 @@ msgstr "Ignoruj wybrane błędy następnym razem." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Całą grupę" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Pojedyncze elementy" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Nic" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +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 "" @@ -13883,18 +13897,18 @@ msgstr "Przecinające się drogi" -#: ../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 "" @@ -14124,7 +14138,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 "" @@ -14267,5 +14280,5 @@ #. 50000 #. -#. +#. #. #. @@ -14273,5 +14286,5 @@ #. #. -#. +#. #. #. @@ -14281,5 +14294,5 @@ #. 50000 #. -#. +#. #. #. @@ -14288,5 +14301,5 @@ #. 50000 #. -#. +#. #. #. @@ -14295,5 +14308,5 @@ #. 50000 #. -#. +#. #. #. @@ -14302,5 +14315,5 @@ #. 50000 #. -#. +#. #. #. @@ -14309,5 +14322,5 @@ #. 50000 #. -#. +#. #. #. @@ -14316,9 +14329,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14363,5 +14376,5 @@ #. 50000 #. -#. +#. #. #. @@ -14494,14 +14507,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 " @@ -14510,14 +14523,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 "" @@ -14526,5 +14539,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 "" @@ -14536,13 +14549,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." @@ -14698,50 +14711,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 "Zmiana rozdzielczości" -#: ../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 "Błędny format pliku" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "Błąd podczas ładowania pliku" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -14817,5 +14830,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 "" @@ -14853,21 +14866,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 " @@ -14879,21 +14887,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 " @@ -14902,10 +14910,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 " @@ -14914,21 +14922,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 " @@ -14938,16 +14945,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 " @@ -14957,10 +14964,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 " @@ -14969,5 +14976,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 " @@ -14977,27 +14984,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 " @@ -15006,15 +15013,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 +msgid "Let other applications send commands to JOSM." +msgstr "" + +#. Plugin routes #: build/trans_plugins.java:55 -msgid "Let other applications send commands to JOSM." -msgstr "" - -#. Plugin routes -#: build/trans_plugins.java:57 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15023,10 +15030,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 " @@ -15035,15 +15042,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 " @@ -15053,17 +15060,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 " @@ -15072,5 +15072,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15081,10 +15081,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, ...)." @@ -16137,8 +16137,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16335,5 +16335,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16343,5 +16343,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16360,5 +16360,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16368,5 +16368,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16385,5 +16385,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16393,5 +16393,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16410,5 +16410,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16418,5 +16418,5 @@ #. 300000 #. -#. +#. #. #. @@ -16431,5 +16431,5 @@ #. 300000 #. -#. +#. #. #. @@ -16447,5 +16447,5 @@ #. 50000 #. -#. +#. #. #. @@ -16463,5 +16463,5 @@ #. 40000 #. -#. +#. #. #. @@ -16470,5 +16470,5 @@ #. 40000 #. -#. +#. #. #. @@ -16478,5 +16478,5 @@ #. 50000 #. -#. +#. #. #. @@ -16496,5 +16496,5 @@ #. 50000 #. -#. +#. #. #. @@ -16503,5 +16503,5 @@ #. 50000 #. -#. +#. #. #. @@ -16511,5 +16511,5 @@ #. 50000 #. -#. +#. #. #. @@ -16559,7 +16559,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17258,5 +17258,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17295,5 +17295,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17389,5 +17389,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17544,5 +17544,5 @@ #. 50000 #. -#. +#. #. #. @@ -18929,5 +18929,5 @@ #. 30000 #. -#. +#. #. #. @@ -18937,5 +18937,5 @@ #. 40000 #. -#. +#. #. #. @@ -18945,5 +18945,5 @@ #. 20000 #. -#. +#. #. #. @@ -18953,5 +18953,5 @@ #. 40000 #. -#. +#. #. #. @@ -19309,7 +19309,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19319,5 +19319,5 @@ #. 50000 #. -#. +#. #. #. @@ -19327,5 +19327,5 @@ #. 50000 #. -#. +#. #. #. @@ -19335,5 +19335,5 @@ #. 50000 #. -#. +#. #. #. @@ -19343,5 +19343,5 @@ #. 50000 #. -#. +#. #. #. @@ -19351,5 +19351,5 @@ #. 50000 #. -#. +#. #. #. @@ -19359,5 +19359,5 @@ #. 50000 #. -#. +#. #. #. @@ -19367,5 +19367,5 @@ #. 50000 #. -#. +#. #. #. @@ -19375,5 +19375,5 @@ #. 50000 #. -#. +#. #. #. @@ -19383,5 +19383,5 @@ #. 50000 #. -#. +#. #. #. @@ -19391,5 +19391,5 @@ #. 50000 #. -#. +#. #. #. @@ -19399,5 +19399,5 @@ #. 50000 #. -#. +#. #. #. @@ -19407,5 +19407,5 @@ #. 50000 #. -#. +#. #. #. @@ -19415,5 +19415,5 @@ #. 50000 #. -#. +#. #. #. @@ -19423,5 +19423,5 @@ #. 50000 #. -#. +#. #. #. @@ -19431,5 +19431,5 @@ #. 50000 #. -#. +#. #. #. @@ -19439,5 +19439,5 @@ #. 50000 #. -#. +#. #. #. @@ -19447,5 +19447,5 @@ #. 50000 #. -#. +#. #. #. @@ -19455,5 +19455,5 @@ #. 50000 #. -#. +#. #. #. @@ -19463,5 +19463,5 @@ #. 50000 #. -#. +#. #. #. @@ -19471,5 +19471,5 @@ #. 50000 #. -#. +#. #. #. @@ -19479,5 +19479,5 @@ #. 50000 #. -#. +#. #. #. @@ -19487,5 +19487,5 @@ #. 50000 #. -#. +#. #. #. @@ -19495,5 +19495,5 @@ #. 50000 #. -#. +#. #. #. @@ -19503,5 +19503,5 @@ #. 50000 #. -#. +#. #. #. @@ -19511,5 +19511,5 @@ #. 50000 #. -#. +#. #. #. @@ -19519,5 +19519,5 @@ #. 50000 #. -#. +#. #. #. @@ -19527,5 +19527,5 @@ #. 50000 #. -#. +#. #. #. @@ -19535,5 +19535,5 @@ #. 50000 #. -#. +#. #. #. @@ -19543,5 +19543,5 @@ #. 50000 #. -#. +#. #. #. @@ -19551,5 +19551,5 @@ #. 50000 #. -#. +#. #. #. @@ -19559,5 +19559,5 @@ #. 50000 #. -#. +#. #. #. @@ -19567,5 +19567,5 @@ #. 50000 #. -#. +#. #. #. @@ -19575,5 +19575,5 @@ #. 50000 #. -#. +#. #. #. @@ -19583,5 +19583,5 @@ #. 50000 #. -#. +#. #. #. @@ -19591,5 +19591,5 @@ #. 50000 #. -#. +#. #. #. @@ -19599,5 +19599,5 @@ #. 50000 #. -#. +#. #. #. @@ -19607,5 +19607,5 @@ #. 50000 #. -#. +#. #. #. @@ -19615,5 +19615,5 @@ #. 50000 #. -#. +#. #. #. @@ -19623,5 +19623,5 @@ #. 50000 #. -#. +#. #. #. @@ -19631,5 +19631,5 @@ #. 50000 #. -#. +#. #. #. @@ -19639,5 +19639,5 @@ #. 50000 #. -#. +#. #. #. @@ -19647,5 +19647,5 @@ #. 50000 #. -#. +#. #. #. @@ -19655,5 +19655,5 @@ #. 50000 #. -#. +#. #. #. @@ -19663,5 +19663,5 @@ #. 50000 #. -#. +#. #. #. @@ -19671,5 +19671,5 @@ #. 50000 #. -#. +#. #. #. @@ -19679,5 +19679,5 @@ #. 50000 #. -#. +#. #. #. @@ -21371,7 +21371,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21381,5 +21381,5 @@ #. 50000 #. -#. +#. #. #. @@ -21389,5 +21389,5 @@ #. 50000 #. -#. +#. #. #. @@ -21397,5 +21397,5 @@ #. 50000 #. -#. +#. #. #. @@ -21405,5 +21405,5 @@ #. 50000 #. -#. +#. #. #. @@ -21413,5 +21413,5 @@ #. 50000 #. -#. +#. #. #. @@ -21421,5 +21421,5 @@ #. 50000 #. -#. +#. #. #. @@ -21429,5 +21429,5 @@ #. 50000 #. -#. +#. #. #. @@ -21749,5 +21749,5 @@ #: build/trans_presets.java:2603 msgid "Computer" -msgstr "komputery" +msgstr "Komputer" #. item "Shops/Computer" @@ -22758,5 +22758,5 @@ #. 40000 #. -#. +#. #. #. @@ -22772,5 +22772,5 @@ #. 30000 #. -#. +#. #. #. @@ -22781,7 +22781,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22791,5 +22791,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22799,13 +22807,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22815,5 +22815,5 @@ #. 50000 #. -#. +#. #. #. @@ -22846,5 +22846,5 @@ #. 50000 #. -#. +#. #. #. @@ -22860,5 +22860,5 @@ #. 50000 #. -#. +#. #. #. @@ -22868,5 +22868,5 @@ #. 10000 #. -#. +#. #. #. @@ -22876,5 +22876,5 @@ #. 10000 #. -#. +#. #. #. @@ -22885,5 +22885,5 @@ #. 10000 #. -#. +#. #. #. @@ -22912,5 +22912,5 @@ #. 50000 #. -#. +#. #. #. @@ -23025,9 +23025,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 @@ -23035,5 +23035,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, @@ -23043,8 +23043,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 @@ -23058,5 +23058,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23064,5 +23064,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23111,6 +23111,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23190,5 +23190,5 @@ #. 40000 #. -#. +#. #. #. @@ -23198,5 +23198,5 @@ #. 10000 #. -#. +#. #. #. @@ -23205,5 +23205,5 @@ #. 50000 #. -#. +#. #. #. @@ -23213,5 +23213,5 @@ #. 50000 #. -#. +#. #. #. @@ -23220,5 +23220,5 @@ #. 50000 #. -#. +#. #. #. @@ -23227,5 +23227,5 @@ #. 50000 #. -#. +#. #. #. @@ -23234,5 +23234,5 @@ #. 50000 #. -#. +#. #. #. @@ -23241,5 +23241,5 @@ #. 50000 #. -#. +#. #. #. @@ -23248,5 +23248,5 @@ #. 40000 #. -#. +#. #. #. @@ -23255,5 +23255,5 @@ #. 50000 #. -#. +#. #. #. @@ -23262,5 +23262,5 @@ #. 50000 #. -#. +#. #. #. @@ -23269,5 +23269,5 @@ #. 50000 #. -#. +#. #. #. @@ -23276,5 +23276,5 @@ #. 50000 #. -#. +#. #. #. @@ -23283,5 +23283,5 @@ #. 50000 #. -#. +#. #. #. @@ -23290,5 +23290,5 @@ #. 50000 #. -#. +#. #. #. @@ -23298,5 +23298,5 @@ #. 50000 #. -#. +#. #. #. @@ -23305,5 +23305,5 @@ #. 50000 #. -#. +#. #. #. @@ -23314,5 +23314,5 @@ #. 50000 #. -#. +#. #. #. @@ -23324,11 +23324,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23337,7 +23337,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23348,5 +23348,5 @@ #. 50000 #. -#. +#. #. #. @@ -23357,5 +23357,5 @@ #. 50000 #. -#. +#. #. #. @@ -23366,5 +23366,5 @@ #. 50000 #. -#. +#. #. #. @@ -23375,5 +23375,5 @@ #. 50000 #. -#. +#. #. #. @@ -23384,5 +23384,5 @@ #. 50000 #. -#. +#. #. #. @@ -23393,5 +23393,5 @@ #. 40000 #. -#. +#. #. #. @@ -23403,5 +23403,5 @@ #. 50000 #. -#. +#. #. #. @@ -23412,5 +23412,5 @@ #. 50000 #. -#. +#. #. #. @@ -23435,5 +23435,5 @@ #. 10000 #. -#. +#. #. #. @@ -23442,5 +23442,5 @@ #. 50000 #. -#. +#. #. #. @@ -23449,5 +23449,5 @@ #. 50000 #. -#. +#. #. #. @@ -23463,5 +23463,5 @@ #. 20000 #. -#. +#. #. #. @@ -23475,5 +23475,5 @@ #. 30000 #. -#. +#. #. #. @@ -23482,5 +23482,5 @@ #. 50000 #. -#. +#. #. #. @@ -23489,5 +23489,5 @@ #. 50000 #. -#. +#. #. #. @@ -23496,5 +23496,5 @@ #. 50000 #. -#. +#. #. #. @@ -23503,5 +23503,5 @@ #. 50000 #. -#. +#. #. #. @@ -23510,5 +23510,5 @@ #. 50000 #. -#. +#. #. #. @@ -23517,5 +23517,5 @@ #. 50000 #. -#. +#. #. #. @@ -23524,5 +23524,5 @@ #. 50000 #. -#. +#. #. #. @@ -23531,5 +23531,5 @@ #. 50000 #. -#. +#. #. #. @@ -23538,5 +23538,5 @@ #. 50000 #. -#. +#. #. #. @@ -23545,5 +23545,5 @@ #. 50000 #. -#. +#. #. #. @@ -23552,5 +23552,5 @@ #. 50000 #. -#. +#. #. #. @@ -23559,5 +23559,5 @@ #. 50000 #. -#. +#. #. #. @@ -23566,5 +23566,5 @@ #. 50000 #. -#. +#. #. #. @@ -23573,5 +23573,5 @@ #. 50000 #. -#. +#. #. #. @@ -23742,7 +23742,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23756,5 +23756,5 @@ #. 40000 #. -#. +#. #. #. @@ -23764,7 +23764,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23774,5 +23774,5 @@ #. 50000 #. -#. +#. #. #. @@ -23782,5 +23782,5 @@ #. 50000 #. -#. +#. #. #. @@ -23790,5 +23790,5 @@ #. 50000 #. -#. +#. #. #. @@ -23798,5 +23798,5 @@ #. 50000 #. -#. +#. #. #. @@ -23812,5 +23812,5 @@ #. 10000 #. -#. +#. #. #. @@ -23820,5 +23820,5 @@ #. 50000 #. -#. +#. #. #. @@ -23828,5 +23828,5 @@ #. 50000 #. -#. +#. #. #. @@ -23836,5 +23836,5 @@ #. 50000 #. -#. +#. #. #. @@ -23844,5 +23844,5 @@ #. 50000 #. -#. +#. #. #. @@ -23852,5 +23852,5 @@ #. 50000 #. -#. +#. #. #. @@ -23860,5 +23860,5 @@ #. 50000 #. -#. +#. #. #. @@ -23877,5 +23877,5 @@ #. 50000 #. -#. +#. #. #. @@ -23884,5 +23884,5 @@ #. 50000 #. -#. +#. #. #. @@ -23896,5 +23896,5 @@ #. 50000 #. -#. +#. #. #. @@ -23908,5 +23908,5 @@ #. 50000 #. -#. +#. #. #. @@ -23915,5 +23915,5 @@ #. 50000 #. -#. +#. #. #. @@ -23927,5 +23927,5 @@ #. 50000 #. -#. +#. #. #. @@ -23940,5 +23940,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23953,5 +23953,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23965,5 +23965,5 @@ #. 50000 #. -#. +#. #. #. @@ -23977,5 +23977,5 @@ #. 50000 #. -#. +#. #. #. @@ -23984,5 +23984,5 @@ #. 50000 #. -#. +#. #. #. @@ -23991,5 +23991,5 @@ #. 50000 #. -#. +#. #. #. @@ -24003,5 +24003,5 @@ #. 50000 #. -#. +#. #. #. @@ -24011,5 +24011,5 @@ #. 50000 #. -#. +#. #. #. @@ -24018,5 +24018,5 @@ #. 50000 #. -#. +#. #. #. @@ -24025,5 +24025,5 @@ #. 50000 #. -#. +#. #. #. @@ -24032,5 +24032,5 @@ #. 50000 #. -#. +#. #. #. @@ -24040,5 +24040,5 @@ #. 50000 #. -#. +#. #. #. @@ -24049,5 +24049,5 @@ #. 50000 #. -#. +#. #. #. @@ -24057,7 +24057,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24067,5 +24067,5 @@ #. 50000 #. -#. +#. #. #. @@ -24075,5 +24075,5 @@ #. 50000 #. -#. +#. #. #. @@ -24083,5 +24083,5 @@ #. 50000 #. -#. +#. #. #. @@ -24092,5 +24092,5 @@ #. 50000 #. -#. +#. #. #. @@ -24100,5 +24100,5 @@ #. 50000 #. -#. +#. #. #. @@ -24108,5 +24108,5 @@ #. 50000 #. -#. +#. #. #. @@ -24116,5 +24116,5 @@ #. 50000 #. -#. +#. #. #. @@ -24124,5 +24124,5 @@ #. 50000 #. -#. +#. #. #. @@ -24132,5 +24132,5 @@ #. 50000 #. -#. +#. #. #. @@ -24140,5 +24140,5 @@ #. 50000 #. -#. +#. #. #. @@ -24148,5 +24148,5 @@ #. 50000 #. -#. +#. #. #. @@ -24156,5 +24156,5 @@ #. 50000 #. -#. +#. #. #. @@ -24177,7 +24177,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24187,5 +24187,5 @@ #. 50000 #. -#. +#. #. #. @@ -24194,5 +24194,5 @@ #. 50000 #. -#. +#. #. #. @@ -24202,5 +24202,5 @@ #. 50000 #. -#. +#. #. #. @@ -24209,5 +24209,5 @@ #. 50000 #. -#. +#. #. #. @@ -24217,5 +24217,5 @@ #. 50000 #. -#. +#. #. #. @@ -24225,5 +24225,5 @@ #. 50000 #. -#. +#. #. #. @@ -24239,5 +24239,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24248,5 +24248,5 @@ #. 50000 #. -#. +#. #. #. @@ -24265,5 +24265,5 @@ #. 50000 #. -#. +#. #. #. @@ -24273,5 +24273,5 @@ #. 50000 #. -#. +#. #. #. @@ -24284,5 +24284,5 @@ #. 50000 #. -#. +#. #. #. @@ -24300,5 +24300,5 @@ #. 50000 #. -#. +#. #. #. @@ -24307,5 +24307,5 @@ #. 50000 #. -#. +#. #. #. @@ -24314,5 +24314,5 @@ #. 50000 #. -#. +#. #. #. @@ -24321,7 +24321,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24332,5 +24332,5 @@ #. 50000 #. -#. +#. #. #. @@ -24345,5 +24345,5 @@ #. 50000 #. -#. +#. #. #. @@ -24357,5 +24357,5 @@ #. 50000 #. -#. +#. #. #. @@ -24365,5 +24365,5 @@ #. 50000 #. -#. +#. #. #. @@ -24377,5 +24377,5 @@ #. 50000 #. -#. +#. #. #. @@ -24389,5 +24389,5 @@ #. 50000 #. -#. +#. #. #. @@ -24396,7 +24396,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24406,5 +24406,5 @@ #. 50000 #. -#. +#. #. #. @@ -24414,5 +24414,5 @@ #. 50000 #. -#. +#. #. #. @@ -24422,5 +24422,5 @@ #. 50000 #. -#. +#. #. #. @@ -24430,5 +24430,5 @@ #. 50000 #. -#. +#. #. #. @@ -24444,7 +24444,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24459,5 +24459,5 @@ #. 30000 #. -#. +#. #. #. @@ -24472,5 +24472,5 @@ #. 30000 #. -#. +#. #. #. @@ -24485,5 +24485,5 @@ #. 30000 #. -#. +#. #. #. @@ -24498,5 +24498,5 @@ #. 30000 #. -#. +#. #. #. @@ -24511,5 +24511,5 @@ #. 30000 #. -#. +#. #. #. @@ -24524,7 +24524,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24534,5 +24534,5 @@ #. 50000 #. -#. +#. #. #. @@ -24541,5 +24541,5 @@ #. 50000 #. -#. +#. #. #. @@ -24549,5 +24549,5 @@ #. 50000 #. -#. +#. #. #. @@ -24557,5 +24557,5 @@ #. 50000 #. -#. +#. #. #. @@ -24565,5 +24565,5 @@ #. 50000 #. -#. +#. #. #. @@ -24573,5 +24573,5 @@ #. 50000 #. -#. +#. #. #. @@ -24581,5 +24581,5 @@ #. 50000 #. -#. +#. #. #. @@ -24589,5 +24589,5 @@ #. 50000 #. -#. +#. #. #. @@ -24597,5 +24597,5 @@ #. 50000 #. -#. +#. #. #. @@ -24605,5 +24605,5 @@ #. 50000 #. -#. +#. #. #. @@ -24613,5 +24613,5 @@ #. 50000 #. -#. +#. #. #. @@ -24621,5 +24621,5 @@ #. 50000 #. -#. +#. #. #. @@ -24629,5 +24629,5 @@ #. 50000 #. -#. +#. #. #. @@ -24647,5 +24647,5 @@ #. 50000 #. -#. +#. #. #. @@ -24660,5 +24660,5 @@ #. 50000 #. -#. +#. #. #. @@ -24671,7 +24671,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24681,5 +24681,5 @@ #. 50000 #. -#. +#. #. #. @@ -24689,5 +24689,5 @@ #. 50000 #. -#. +#. #. #. @@ -24697,5 +24697,5 @@ #. 50000 #. -#. +#. #. #. @@ -24705,5 +24705,5 @@ #. 50000 #. -#. +#. #. #. @@ -24713,5 +24713,5 @@ #. 50000 #. -#. +#. #. #. @@ -24721,5 +24721,5 @@ #. 50000 #. -#. +#. #. #. @@ -24729,5 +24729,5 @@ #. 50000 #. -#. +#. #. #. @@ -24737,5 +24737,5 @@ #. 50000 #. -#. +#. #. #. @@ -24745,5 +24745,5 @@ #. 50000 #. -#. +#. #. #. @@ -24753,5 +24753,5 @@ #. 50000 #. -#. +#. #. #. @@ -24761,5 +24761,5 @@ #. 50000 #. -#. +#. #. #. @@ -24769,5 +24769,5 @@ #. 50000 #. -#. +#. #. #. @@ -24777,5 +24777,5 @@ #. 50000 #. -#. +#. #. #. @@ -24785,5 +24785,5 @@ #. 50000 #. -#. +#. #. #. @@ -24804,5 +24804,5 @@ #. 50000 #. -#. +#. #. #. @@ -24816,7 +24816,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24826,5 +24826,5 @@ #. 50000 #. -#. +#. #. #. @@ -24834,5 +24834,5 @@ #. 50000 #. -#. +#. #. #. @@ -24842,5 +24842,5 @@ #. 50000 #. -#. +#. #. #. @@ -24850,5 +24850,5 @@ #. 50000 #. -#. +#. #. #. @@ -24858,5 +24858,5 @@ #. 50000 #. -#. +#. #. #. @@ -24866,5 +24866,5 @@ #. 50000 #. -#. +#. #. #. @@ -24874,5 +24874,5 @@ #. 50000 #. -#. +#. #. #. @@ -24889,5 +24889,5 @@ #. 50000 #. -#. +#. #. #. @@ -24897,5 +24897,5 @@ #. 50000 #. -#. +#. #. #. @@ -24905,5 +24905,5 @@ #. 50000 #. -#. +#. #. #. @@ -24913,5 +24913,5 @@ #. 50000 #. -#. +#. #. #. @@ -24921,5 +24921,5 @@ #. 50000 #. -#. +#. #. #. @@ -24929,5 +24929,5 @@ #. 50000 #. -#. +#. #. #. @@ -24937,5 +24937,5 @@ #. 50000 #. -#. +#. #. #. @@ -24945,5 +24945,5 @@ #. 50000 #. -#. +#. #. #. @@ -24953,5 +24953,5 @@ #. 50000 #. -#. +#. #. #. @@ -24961,5 +24961,5 @@ #. 50000 #. -#. +#. #. #. @@ -24969,5 +24969,5 @@ #. 50000 #. -#. +#. #. #. @@ -24977,5 +24977,5 @@ #. 50000 #. -#. +#. #. #. @@ -24994,5 +24994,5 @@ #. 50000 #. -#. +#. #. #. @@ -25002,5 +25002,5 @@ #. 50000 #. -#. +#. #. #. @@ -25009,5 +25009,5 @@ #. 50000 #. -#. +#. #. #. @@ -25017,5 +25017,5 @@ #. 50000 #. -#. +#. #. #. @@ -25025,5 +25025,5 @@ #. 50000 #. -#. +#. #. #. @@ -25033,5 +25033,5 @@ #. 50000 #. -#. +#. #. #. @@ -25040,5 +25040,5 @@ #. 50000 #. -#. +#. #. #. @@ -25048,5 +25048,5 @@ #. 50000 #. -#. +#. #. #. @@ -25056,5 +25056,5 @@ #. 50000 #. -#. +#. #. #. @@ -25064,5 +25064,5 @@ #. 50000 #. -#. +#. #. #. @@ -25072,5 +25072,5 @@ #. 50000 #. -#. +#. #. #. @@ -25079,5 +25079,5 @@ #. 50000 #. -#. +#. #. #. @@ -25086,5 +25086,5 @@ #. 50000 #. -#. +#. #. #. @@ -25093,5 +25093,5 @@ #. 50000 #. -#. +#. #. #. @@ -25100,5 +25100,5 @@ #. 50000 #. -#. +#. #. #. @@ -25107,5 +25107,5 @@ #. 50000 #. -#. +#. #. #. @@ -25114,5 +25114,5 @@ #. 50000 #. -#. +#. #. #. @@ -25121,5 +25121,5 @@ #. 50000 #. -#. +#. #. #. @@ -25128,5 +25128,5 @@ #. 50000 #. -#. +#. #. #. @@ -25135,5 +25135,5 @@ #. 50000 #. -#. +#. #. #. @@ -25142,5 +25142,5 @@ #. 50000 #. -#. +#. #. #. @@ -25149,5 +25149,5 @@ #. 50000 #. -#. +#. #. #. @@ -25156,5 +25156,5 @@ #. 50000 #. -#. +#. #. #. @@ -25163,5 +25163,5 @@ #. 50000 #. -#. +#. #. #. @@ -25171,5 +25171,5 @@ #. 50000 #. -#. +#. #. #. @@ -25179,5 +25179,5 @@ #. 50000 #. -#. +#. #. #. @@ -25187,5 +25187,5 @@ #. 50000 #. -#. +#. #. #. @@ -25195,5 +25195,5 @@ #. 50000 #. -#. +#. #. #. @@ -25203,5 +25203,5 @@ #. 50000 #. -#. +#. #. #. @@ -25211,5 +25211,5 @@ #. 50000 #. -#. +#. #. #. @@ -25219,5 +25219,5 @@ #. 50000 #. -#. +#. #. #. @@ -25227,5 +25227,5 @@ #. 50000 #. -#. +#. #. #. @@ -25235,5 +25235,5 @@ #. 50000 #. -#. +#. #. #. @@ -25244,5 +25244,5 @@ #. 50000 #. -#. +#. #. #. @@ -25252,5 +25252,5 @@ #. 50000 #. -#. +#. #. #. @@ -25260,5 +25260,5 @@ #. 50000 #. -#. +#. #. #. @@ -25268,5 +25268,5 @@ #. 50000 #. -#. +#. #. #. @@ -25276,5 +25276,5 @@ #. 50000 #. -#. +#. #. #. @@ -25284,5 +25284,5 @@ #. 50000 #. -#. +#. #. #. @@ -25292,5 +25292,5 @@ #. 50000 #. -#. +#. #. #. @@ -25300,5 +25300,5 @@ #. 50000 #. -#. +#. #. #. @@ -25308,5 +25308,5 @@ #. 50000 #. -#. +#. #. #. @@ -25316,5 +25316,5 @@ #. 50000 #. -#. +#. #. #. @@ -25324,5 +25324,5 @@ #. 50000 #. -#. +#. #. #. @@ -25332,5 +25332,5 @@ #. 50000 #. -#. +#. #. #. @@ -25340,5 +25340,5 @@ #. 50000 #. -#. +#. #. #. @@ -25348,5 +25348,5 @@ #. 50000 #. -#. +#. #. #. @@ -25356,5 +25356,5 @@ #. 50000 #. -#. +#. #. #. @@ -25364,5 +25364,5 @@ #. 50000 #. -#. +#. #. #. @@ -25372,5 +25372,5 @@ #. 50000 #. -#. +#. #. #. @@ -25380,5 +25380,5 @@ #. 50000 #. -#. +#. #. #. @@ -25388,5 +25388,5 @@ #. 50000 #. -#. +#. #. #. @@ -25395,5 +25395,5 @@ #. 50000 #. -#. +#. #. #. @@ -25425,5 +25425,5 @@ #. 50000 #. -#. +#. #. #. @@ -25433,5 +25433,5 @@ #. 50000 #. -#. +#. #. #. @@ -25441,7 +25441,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25456,5 +25456,5 @@ #. 50000 #. -#. +#. #. #. @@ -25464,5 +25464,5 @@ #. 50000 #. -#. +#. #. #. @@ -25472,5 +25472,5 @@ #. 50000 #. -#. +#. #. #. @@ -25480,5 +25480,5 @@ #. 50000 #. -#. +#. #. #. @@ -25488,5 +25488,5 @@ #. 50000 #. -#. +#. #. #. @@ -25496,5 +25496,5 @@ #. 50000 #. -#. +#. #. #. @@ -25504,5 +25504,5 @@ #. 50000 #. -#. +#. #. #. @@ -25518,7 +25518,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25528,5 +25528,5 @@ #. 50000 #. -#. +#. #. #. @@ -25536,5 +25536,5 @@ #. 50000 #. -#. +#. #. #. @@ -25544,5 +25544,5 @@ #. 50000 #. -#. +#. #. #. @@ -25552,5 +25552,5 @@ #. 50000 #. -#. +#. #. #. @@ -25560,5 +25560,5 @@ #. 50000 #. -#. +#. #. #. @@ -25568,5 +25568,5 @@ #. 50000 #. -#. +#. #. #. @@ -25576,5 +25576,5 @@ #. 50000 #. -#. +#. #. #. @@ -25584,5 +25584,5 @@ #. 50000 #. -#. +#. #. #. @@ -25592,5 +25592,5 @@ #. 50000 #. -#. +#. #. #. @@ -25600,5 +25600,5 @@ #. 50000 #. -#. +#. #. #. @@ -25608,5 +25608,5 @@ #. 50000 #. -#. +#. #. #. @@ -25616,5 +25616,5 @@ #. 50000 #. -#. +#. #. #. @@ -25624,5 +25624,5 @@ #. 50000 #. -#. +#. #. #. @@ -25632,5 +25632,5 @@ #. 50000 #. -#. +#. #. #. @@ -25640,5 +25640,5 @@ #. 50000 #. -#. +#. #. #. @@ -25648,5 +25648,5 @@ #. 50000 #. -#. +#. #. #. @@ -25656,5 +25656,5 @@ #. 50000 #. -#. +#. #. #. @@ -25664,5 +25664,5 @@ #. 50000 #. -#. +#. #. #. @@ -25672,5 +25672,5 @@ #. 50000 #. -#. +#. #. #. @@ -25680,5 +25680,5 @@ #. 50000 #. -#. +#. #. #. @@ -25688,5 +25688,5 @@ #. 50000 #. -#. +#. #. #. @@ -25696,5 +25696,5 @@ #. 50000 #. -#. +#. #. #. @@ -25704,5 +25704,5 @@ #. 50000 #. -#. +#. #. #. @@ -25712,5 +25712,5 @@ #. 50000 #. -#. +#. #. #. @@ -25720,5 +25720,5 @@ #. 50000 #. -#. +#. #. #. @@ -25728,5 +25728,5 @@ #. 50000 #. -#. +#. #. #. @@ -25736,5 +25736,5 @@ #. 50000 #. -#. +#. #. #. @@ -25744,5 +25744,5 @@ #. 50000 #. -#. +#. #. #. @@ -25752,5 +25752,5 @@ #. 50000 #. -#. +#. #. #. @@ -25760,5 +25760,5 @@ #. 50000 #. -#. +#. #. #. @@ -25768,5 +25768,5 @@ #. 50000 #. -#. +#. #. #. @@ -25776,5 +25776,5 @@ #. 50000 #. -#. +#. #. #. @@ -25784,5 +25784,5 @@ #. 50000 #. -#. +#. #. #. @@ -25792,5 +25792,5 @@ #. 50000 #. -#. +#. #. #. @@ -25800,5 +25800,5 @@ #. 50000 #. -#. +#. #. #. @@ -25808,5 +25808,5 @@ #. 50000 #. -#. +#. #. #. @@ -25816,5 +25816,5 @@ #. 50000 #. -#. +#. #. #. @@ -25824,5 +25824,5 @@ #. 50000 #. -#. +#. #. #. @@ -25832,5 +25832,5 @@ #. 50000 #. -#. +#. #. #. @@ -25840,5 +25840,5 @@ #. 50000 #. -#. +#. #. #. @@ -25848,5 +25848,5 @@ #. 50000 #. -#. +#. #. #. @@ -25856,5 +25856,5 @@ #. 50000 #. -#. +#. #. #. @@ -25890,7 +25890,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25900,5 +25900,5 @@ #. 50000 #. -#. +#. #. #. @@ -25908,5 +25908,5 @@ #. 50000 #. -#. +#. #. #. @@ -25916,5 +25916,5 @@ #. 50000 #. -#. +#. #. #. @@ -25924,5 +25924,5 @@ #. 50000 #. -#. +#. #. #. @@ -25932,5 +25932,5 @@ #. 50000 #. -#. +#. #. #. @@ -25940,5 +25940,5 @@ #. 50000 #. -#. +#. #. #. @@ -25948,5 +25948,5 @@ #. 50000 #. -#. +#. #. #. @@ -25963,5 +25963,5 @@ #. 50000 #. -#. +#. #. #. @@ -25971,5 +25971,5 @@ #. 50000 #. -#. +#. #. #. @@ -25979,5 +25979,5 @@ #. 50000 #. -#. +#. #. #. @@ -25987,5 +25987,5 @@ #. 50000 #. -#. +#. #. #. @@ -25995,5 +25995,5 @@ #. 50000 #. -#. +#. #. #. @@ -26003,5 +26003,5 @@ #. 50000 #. -#. +#. #. #. @@ -26012,5 +26012,5 @@ #. 50000 #. -#. +#. #. #. @@ -26020,5 +26020,5 @@ #. 50000 #. -#. +#. #. #. @@ -26028,5 +26028,5 @@ #. 40000 #. -#. +#. #. #. @@ -26036,5 +26036,5 @@ #. 50000 #. -#. +#. #. #. @@ -26043,5 +26043,5 @@ #. 40000 #. -#. +#. #. #. @@ -26050,5 +26050,5 @@ #. 40000 #. -#. +#. #. #. @@ -26066,7 +26066,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26076,5 +26076,5 @@ #. 50000 #. -#. +#. #. #. @@ -26084,5 +26084,5 @@ #. 50000 #. -#. +#. #. #. @@ -26092,5 +26092,5 @@ #. 50000 #. -#. +#. #. #. @@ -26100,5 +26100,5 @@ #. 50000 #. -#. +#. #. #. @@ -26108,5 +26108,5 @@ #. 50000 #. -#. +#. #. #. @@ -26116,5 +26116,5 @@ #. 50000 #. -#. +#. #. #. @@ -26124,5 +26124,5 @@ #. 50000 #. -#. +#. #. #. @@ -26132,5 +26132,5 @@ #. 50000 #. -#. +#. #. #. @@ -26140,5 +26140,5 @@ #. 50000 #. -#. +#. #. #. @@ -26157,5 +26157,5 @@ #. 50000 #. -#. +#. #. #. @@ -26169,5 +26169,5 @@ #. 50000 #. -#. +#. #. #. @@ -26181,5 +26181,5 @@ #. 50000 #. -#. +#. #. #. @@ -26189,5 +26189,5 @@ #. 50000 #. -#. +#. #. #. @@ -26201,5 +26201,5 @@ #. 50000 #. -#. +#. #. #. @@ -26213,5 +26213,5 @@ #. 50000 #. -#. +#. #. #. @@ -26225,6 +26225,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26234,5 +26234,5 @@ #. 50000 #. -#. +#. #. #. @@ -26246,5 +26246,5 @@ #. 50000 #. -#. +#. #. #. @@ -26258,5 +26258,5 @@ #. 50000 #. -#. +#. #. #. @@ -26270,5 +26270,5 @@ #. 50000 #. -#. +#. #. #. @@ -26282,5 +26282,5 @@ #. 50000 #. -#. +#. #. #. @@ -26294,5 +26294,5 @@ #. 50000 #. -#. +#. #. #. @@ -26302,7 +26302,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26312,5 +26312,5 @@ #. 50000 #. -#. +#. #. #. @@ -26320,5 +26320,5 @@ #. 50000 #. -#. +#. #. #. @@ -26328,5 +26328,5 @@ #. 50000 #. -#. +#. #. #. @@ -26336,5 +26336,5 @@ #. 50000 #. -#. +#. #. #. @@ -26351,5 +26351,5 @@ #. 50000 #. -#. +#. #. #. @@ -26362,5 +26362,5 @@ #. 50000 #. -#. +#. #. #. @@ -26374,5 +26374,5 @@ #. 50000 #. -#. +#. #. #. @@ -26386,5 +26386,5 @@ #. 50000 #. -#. +#. #. #. @@ -26398,5 +26398,5 @@ #. 50000 #. -#. +#. #. #. @@ -26407,5 +26407,5 @@ #. 50000 #. -#. +#. #. #. @@ -26415,5 +26415,5 @@ #. 50000 #. -#. +#. #. #. @@ -26423,5 +26423,5 @@ #. 50000 #. -#. +#. #. #. @@ -26431,5 +26431,5 @@ #. 50000 #. -#. +#. #. #. @@ -26439,5 +26439,5 @@ #. 50000 #. -#. +#. #. #. @@ -26454,5 +26454,5 @@ #. 50000 #. -#. +#. #. #. @@ -26466,5 +26466,5 @@ #. 50000 #. -#. +#. #. #. @@ -26478,5 +26478,5 @@ #. 50000 #. -#. +#. #. #. @@ -26490,5 +26490,5 @@ #. 50000 #. -#. +#. #. #. @@ -26502,5 +26502,5 @@ #. 50000 #. -#. +#. #. #. @@ -26514,5 +26514,5 @@ #. 50000 #. -#. +#. #. #. @@ -26521,7 +26521,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26531,5 +26531,5 @@ #. 50000 #. -#. +#. #. #. @@ -26539,5 +26539,5 @@ #. 50000 #. -#. +#. #. #. @@ -26547,5 +26547,5 @@ #. 50000 #. -#. +#. #. #. @@ -26555,5 +26555,5 @@ #. 50000 #. -#. +#. #. #. @@ -26563,5 +26563,5 @@ #. 50000 #. -#. +#. #. #. @@ -26571,5 +26571,5 @@ #. 50000 #. -#. +#. #. #. @@ -26579,5 +26579,5 @@ #. 50000 #. -#. +#. #. #. @@ -26594,7 +26594,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26604,5 +26604,5 @@ #. 50000 #. -#. +#. #. #. @@ -26612,5 +26612,5 @@ #. 50000 #. -#. +#. #. #. @@ -26620,5 +26620,5 @@ #. 50000 #. -#. +#. #. #. @@ -26628,5 +26628,5 @@ #. 50000 #. -#. +#. #. #. @@ -26642,5 +26642,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26689,5 +26689,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26697,5 +26697,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26705,5 +26705,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26713,5 +26713,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26721,5 +26721,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26729,5 +26729,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26737,5 +26737,5 @@ #. 50000 #. -#. +#. #. #. @@ -26745,5 +26745,5 @@ #. 50000 #. -#. +#. #. #. @@ -26753,5 +26753,5 @@ #. 50000 #. -#. +#. #. #. @@ -26761,5 +26761,5 @@ #. 50000 #. -#. +#. #. #. @@ -26769,5 +26769,5 @@ #. 50000 #. -#. +#. #. #. @@ -26777,5 +26777,5 @@ #. 50000 #. -#. +#. #. #. @@ -26795,5 +26795,5 @@ #. 50000 #. -#. +#. #. #. @@ -26802,5 +26802,5 @@ #. 50000 #. -#. +#. #. #. @@ -26809,5 +26809,5 @@ #. 50000 #. -#. +#. #. #. @@ -26816,5 +26816,5 @@ #. 40000 #. -#. +#. #. #. @@ -26823,5 +26823,5 @@ #. 40000 #. -#. +#. #. #. @@ -26830,5 +26830,5 @@ #. 40000 #. -#. +#. #. #. @@ -26923,5 +26923,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -26929,28 +26929,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 @@ -27065,5 +27065,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27076,5 +27076,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27099,6 +27099,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27107,6 +27107,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27121,6 +27121,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 @@ -27134,6 +27134,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 @@ -27153,6 +27153,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27176,6 +27176,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 @@ -27188,4 +27188,67 @@ msgstr "" +#~ msgid "Images for {0}" +#~ msgstr "Obrazy dla {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Wczytaj GPX..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Brak znacznika czasowego dla punktu {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym" + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS początek: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS koniec: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "aktualne przesunięcie: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "różnica stref czasowych: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} wewnątrz ścieżki GPS." + +#~ msgid "Sync clock" +#~ msgstr "Synchronizuj zegar" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie." + +#~ msgid "Image" +#~ msgstr "Obraz" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synchronizuj czas z urządzeniem GPS" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Podany czas nie został rozpoznany." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Geotagowane obrazy" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Otwórz obrazy za pomocą AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "opcje osmarender" + #~ msgid "Move" #~ msgstr "Przenieś" @@ -27248,9 +27311,7 @@ #~ msgstr "Użytkownik OSM (email)" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Używa szablon \"{0}\" z grupy \"{1}\"" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Używa szablon \"{0}\"" @@ -27262,8 +27323,4 @@ #~ msgstr "EPSG:4326" -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Usuń {1} {0}" - #~ msgid "Combine ways with different memberships?" #~ msgstr "Czy połączyć drogi, które należą do różnych relacji?" @@ -27296,5 +27353,4 @@ #~ msgstr "Nie zaimportowano danych." -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Błąd w czasie ładowania strony {0}" @@ -27312,5 +27368,4 @@ #~ msgstr "Sprzeczne relacje" -#, java-format #~ msgid "rectifier id={0}" #~ msgstr "rectifier id={0}" @@ -27329,11 +27384,10 @@ #~ "about the problem." #~ msgstr "" -#~ "Wtyczka nie może zostać usunięta. Proszę przekaż informacje o tym problemie " -#~ "autorom JOSM." +#~ "Wtyczka nie może zostać usunięta. Proszę przekaż informacje o tym " +#~ "problemie autorom JOSM." #~ msgid "Transfer aborted due to error (will wait for 5 seconds):" #~ msgstr "Transfer przerwany z powodu błędu (czekam 5 sekund):" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Plugin wymaga aktualizacji JOSM: {0}." @@ -27342,5 +27396,4 @@ #~ msgstr " nie posiada referencji" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Proszę zgłosić bład pod adresem {0}" @@ -27350,6 +27403,6 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" #~ "Postaraj się zaintalować najnowszą wersję tej wtyczki przed zgłaszaniem " @@ -27361,11 +27414,11 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" -#~ "UWAGA: Hasło jest zapisywane otwartym tekstem w pliku " -#~ "ustawień.
Hasło jest przesyłane otwartym tekstem podczas połączenia z " -#~ "serwerem i jest częścią adresu.
Nie należy używać żadnych " -#~ "wartościowych haseł" +#~ "UWAGA: Hasło jest zapisywane otwartym tekstem w pliku ustawień." +#~ "
Hasło jest przesyłane otwartym tekstem podczas połączenia z serwerem " +#~ "i jest częścią adresu.
Nie należy używać żadnych wartościowych " +#~ "haseł" #~ msgid "Upload to OSM..." @@ -27374,6 +27427,6 @@ #~ msgid "Include your steps to get to the error (as detailed as possible)!" #~ msgstr "" -#~ "Dołącz instrukcje (dokładne i krok po kroku) w jaki sposób można odtworzyć " -#~ "błędną sytuację." +#~ "Dołącz instrukcje (dokładne i krok po kroku) w jaki sposób można " +#~ "odtworzyć błędną sytuację." #~ msgid "Be sure to include the following information:" @@ -27384,6 +27437,6 @@ #~ "some time." #~ msgstr "" -#~ "Serwer zgłosił błąd wewnętrzny. Spróbuj zmniejszyć obszar lub spróbować po " -#~ "chwili." +#~ "Serwer zgłosił błąd wewnętrzny. Spróbuj zmniejszyć obszar lub spróbować " +#~ "po chwili." #~ msgid "Ill-formed node id" @@ -27403,16 +27456,14 @@ #~ msgstr "Wystąpiły konfikty podczas importowania." -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" #~ "Wtyczka {0} wydaje siębyć zepsuta lub nie można było jej pobrać " #~ "automatycznie." -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Nie można pobrać wtyczki {0} z {1}" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27447,24 +27498,13 @@ #~ msgstr "Plik nie został odnaleziony" -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Proszę wcześniej podać wybrane współrzędne." - -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Błąd podczas usuwania wtyczki: {0}" - -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Konflikty: {0}" -#, java-format #~ msgid "Layers: {0}" #~ msgstr "Warstwy: {0}" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Autorzy: {0}" -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "" @@ -27474,5 +27514,4 @@ #~ msgstr "Wtyczka już istnieje" -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -27481,6 +27520,6 @@ #~ "{0}" #~ msgstr "" -#~ "Archiwum z wtyczką już istnieje. Czy na pewno pobrać aktualną wersję kasując " -#~ "istniejące archiwum?\n" +#~ "Archiwum z wtyczką już istnieje. Czy na pewno pobrać aktualną wersję " +#~ "kasując istniejące archiwum?\n" #~ "\n" #~ "{0}" @@ -27493,6 +27532,6 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" #~ "Wybrane węzły są częścią różnych relacji. Czy nadal chcesz je scalić." @@ -27601,5 +27640,4 @@ #~ msgstr "Kliknij \"Odśwież\" by zaktualizować listę" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Edytor relacji: {0}" @@ -27615,9 +27653,9 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" -#~ "Cofnij stan aktualnie zaznaczonych obiektów do wersji zaznaczonej w liście " -#~ "historia poleceń." +#~ "Cofnij stan aktualnie zaznaczonych obiektów do wersji zaznaczonej w " +#~ "liście historia poleceń." #~ msgid "Edit Properties" @@ -27634,6 +27672,6 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" #~ "Wybrane drogi należą do różnych relacji. Czy nadal chcesz je połączyć?" @@ -27655,5 +27693,4 @@ #~ msgstr "Zaktualizuj dane" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27672,5 +27709,6 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" #~ "Nie znaleziono danych do aktualizacji. Czy została pobrana lub otwarta " @@ -27678,11 +27716,10 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" #~ "Błąd wewnętrzny: proszę zgłosić błąd dla komunikatu: \"cannot check " #~ "conditions for no layer\"." -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -27714,5 +27751,4 @@ #~ msgstr "Nie mogę szukać ponieważ nie załadowano danych." -#, java-format #~ msgid "" #~ "There are unsaved changes in {0} layer. Discard the changes and continue?" @@ -27726,16 +27762,14 @@ #~ "Nie zapisano zmian na {0} warstwach. Porzucić zmiany i kontynuować?" -#, java-format #~ msgid "Help page missing. Create it in English." #~ msgstr "" #~ "Brak strony pomocy. Utwórz ją w języku angielskim." -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" -#~ "Brak strony pomocy. Utwórz ją w języku angielskim lub swoim języku." +#~ "Brak strony pomocy. Utwórz ją w języku angielskim lub " +#~ "swoim języku." #~ msgid "Helppage missing. Create it in English." @@ -27744,11 +27778,10 @@ #~ msgid "" -#~ "Helppage missing. Create it in English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" -#~ "Brak strony pomocy. Możesz ją utworzyć po angielsku lub " -#~ "po polsku." - -#, java-format +#~ "Brak strony pomocy. Możesz ją utworzyć po angielsku " +#~ "lub po polsku." + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "niespodziewana wartość powrotna. Dostałem {0}" Index: /applications/editors/josm/i18n/po/pt_BR.po =================================================================== --- /applications/editors/josm/i18n/po/pt_BR.po (revision 18974) +++ /applications/editors/josm/i18n/po/pt_BR.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:48+0000\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-12-03 19:26+0000\n" "Last-Translator: Rodrigo de Avila \n" "Language-Team: Brazilian Portuguese \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:04+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:16+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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" @@ -116,5 +115,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 @@ -137,9 +136,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 @@ -155,20 +154,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 @@ -187,7 +182,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 "Erro" @@ -267,5 +262,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 "Extensões" @@ -292,6 +287,6 @@ msgstr "" "Aviso: formato inesperado da URL base da API. Redireccionar para a página do " -"usuário para o seu OSM vai, provavelmente, falhar. A URL base da API é: " -"\"{0}\"" +"usuário para o seu OSM vai, provavelmente, falhar. A URL base da API é: \"{0}" +"\"" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82 @@ -301,4 +296,7 @@ "screen with browser windows
and take some time to finish." msgstr "" +"Você está prestes a abrir {0} janelas do navegador.
Isso pode tanto " +"atravancar sua tela com janelas do navegador
quanto levar algum tempo " +"para terminar." #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87 @@ -312,4 +310,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 @@ -317,8 +317,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 @@ -328,29 +328,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 @@ -379,9 +377,9 @@ #, java-format msgid "" -"There are no layers the source layer
''{0}''
could be merged " -"to." -msgstr "" -"Não há camadas em que a camada
''{0}''
possa ser " -"combinada." +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" +"Não há camadas em que a camada
''{0}''
possa ser combinada." #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 @@ -432,14 +430,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 "Latitude" #: ../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 "Longitude" @@ -447,17 +445,17 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 msgid "Please enter a valid latitude in the range -90..90" -msgstr "" +msgstr "Por favor digite uma latitude válida entre -90..90" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 msgid "Please enter a latitude in the range -90..90" -msgstr "" +msgstr "Por favor digite uma latitude entre -90..90" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 msgid "Please enter a valid longitude in the range -180..180" -msgstr "" +msgstr "Por favor digite uma longitude válida entre -180..180" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 msgid "Please enter a longitude in the range -180..180" -msgstr "" +msgstr "Por favor digite uma longitude entre -180..180" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 @@ -465,10 +463,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 @@ -480,9 +478,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 msgid "Close the dialog and create a new node" -msgstr "" +msgstr "Feche a janela de diálogo e crie um novo nó" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 msgid "Close the dialog, don't create a new node" -msgstr "" +msgstr "Feche a janela de diálogo, não crie um novo nó" #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 @@ -499,19 +497,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 @@ -520,9 +521,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 @@ -538,7 +536,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 @@ -550,11 +548,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" @@ -642,5 +640,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}" @@ -695,10 +693,10 @@ "único conjunto de nós)" -#: ../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 "Combinar {0} caminhos" -#: ../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 "Por favor selecione no mínimo 2 caminhos a combinar" @@ -717,19 +715,19 @@ msgstr "Por favor selecione algo a ser copiado" +#: ../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 "Criar Círculo" -#: ../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 "Criar círculo a partir de três nós selecionados." -#: ../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 "Os nós não estão em circulo. Abortando." -#: ../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 " @@ -742,9 +740,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 @@ -810,5 +808,5 @@ #, java-format msgid "Id > 0 required, got {0}" -msgstr "" +msgstr "Exige-se Id > 0, obtido {0}" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89 @@ -817,21 +815,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" @@ -839,6 +841,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 @@ -867,5 +869,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 "Duplicar" @@ -895,14 +897,14 @@ #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30 msgid "Fullscreen View" -msgstr "" +msgstr "Visualização em tela cheia" #. no icon #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32 msgid "Toggle fullscreen view" -msgstr "" +msgstr "Ativa/desativa visualização em tela cheia" #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33 msgid "Toggle Fullscreen view" -msgstr "" +msgstr "Ativa/desativa visualização em tela cheia" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -922,8 +924,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 @@ -931,5 +931,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 @@ -942,8 +942,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 @@ -962,8 +962,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 @@ -986,13 +986,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 @@ -1031,6 +1032,101 @@ #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17 msgid "Display object information about OSM nodes, ways, or relations." -msgstr "" -"Mostrar informações de objeto sobre nós, caminhos ou relações do OSM." +msgstr "Mostrar informações de objeto sobre nós, caminhos ou relações do OSM." + +#: ../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 "Entrada de valores para todos conflitos" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Resolver conflitos" + +#: ../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 @@ -1051,4 +1147,45 @@ msgstr "Sem atalho" +#: ../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 "URL" + +#: ../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" @@ -1059,32 +1196,34 @@ msgstr "Combinar camada atual em outra camada" +#: ../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 "Unir Nós" -#: ../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 "Unir nós no mais antigo" -#: ../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 "Por favor selecione no mínimo dois nós para unir." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126 msgid "Abort Merging" msgstr "Cancelar Mesclagem" -#: ../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 "Clique para cancelar a mesclagem de nós" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135 #, java-format msgid "" "Cannot merge nodes: Would have to delete way ''{0}'' which is still used." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264 +"Impossível mesclar nós: seria necessário apagar via \"{0}\" que ainda é " +"usada." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231 #, java-format msgid "Merge {0} nodes" @@ -1176,10 +1315,10 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69 msgid "Opening files" -msgstr "Abrendo arquivos" +msgstr "Abrindo arquivos" #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88 #, java-format msgid "Opening file ''{0}'' ..." -msgstr "Abrendo arquivo \"{0}\" ..." +msgstr "Abrindo arquivo ''{0}'' ..." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39 @@ -1198,5 +1337,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70 msgid "Select if the data should be downloaded in a new layer" -msgstr "" +msgstr "Indique se os dados devem ser baixados em uma nova camada" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77 @@ -1226,5 +1365,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109 msgid "Download Data" -msgstr "" +msgstr "Baixar dados" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 @@ -1241,13 +1380,13 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 msgid "Orthogonalize Shape / Undo" -msgstr "" +msgstr "Ortogonalizar Forma / Desfazer" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77 msgid "Undo orthogonalization for certain nodes" -msgstr "" +msgstr "Desfazer ortogonalização para alguns nós" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98 msgid "Orthogonalize / Undo" -msgstr "" +msgstr "Ortogonalizar / Desfazer" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105 @@ -1260,5 +1399,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107 msgid "Undo Orthogonalize Shape" -msgstr "" +msgstr "Desfazer Ortogonalizar Forma" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117 @@ -1279,5 +1418,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 msgid "Selected Elements cannot be orthogonalized" -msgstr "" +msgstr "Os Elementos selecionados não podem ser ortogonalizados" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345 @@ -1464,6 +1603,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 "" "Mostrar relatório atual com informações úteis que podem ser anexadas aos bugs" @@ -1484,9 +1622,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 "Fechar" + +#: ../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 "Você tem certeza?" + +#: ../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 @@ -1560,6 +1730,6 @@ "this and correct it when necessary." msgstr "" -"Uma composição de relação foi copiada para todos os caminhos " -"novos.
Deverá verificar isto e corrigir quando necessário." +"Uma composição de relação foi copiada para todos os caminhos novos." +"
Deverá verificar isto e corrigir quando necessário." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 @@ -1620,6 +1790,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 "* Um nó que é usado em mais de um caminho e um destes caminhos, ou" @@ -1702,24 +1871,24 @@ #. 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 "Dados baixados" -#: ../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 +msgstr "Nenhum grupo de dados encontrado" + +#: ../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 "Não consegui encontrar o objeto de id {0} no dataset atual" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Update selection" msgstr "Atualizar seleção" -#: ../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)" @@ -1728,31 +1897,31 @@ "novamente os dados)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 msgid "Update Selection" msgstr "Atualizar Seleção" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 msgid "There are no selected objects to update." msgstr "Não há objetos a atualizar." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "Selection empty" msgstr "Seleção vazia" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 msgid "Update objects" msgstr "Atualiza objetos" -#: ../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 "Enviar dados" -#: ../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 "" "Envia todas as mudanças na camada de dados ativa para o servidor do OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 #, java-format msgid "" @@ -1763,35 +1932,35 @@ "resolvê-los primeiro." -#: ../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 "Não há modificações a enviar." -#: ../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 "Não há nada a enviar. Baixe dados primeiro." -#: ../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 "Sincronizar apenas o nó {0}" -#: ../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 "Sincronizar apenas o caminho {0}" -#: ../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 "Sincronizar apenas a relação {0}" -#: ../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 "Synchronizar todo o conjunto de dados" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1799,9 +1968,8 @@ "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.
" +"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 "" "Envio falhou porque o servidor tem uma nova versão de " @@ -1810,29 +1978,27 @@ "{2}, e sua versão é {3}.

Clique {4} para sincronizar " "somente a primitiva conflitante.
Clique {5} para " -"sincronizar todo o conjunto de dados locais no servidor
Clique " -"{6} para abortar e continuar editando.
" - -#: ../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 +"sincronizar todo o conjunto de dados locais no servidor
Clique {6}" +" para abortar e continuar editando.
" + +#: ../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 "Conflitos detectados" -#: ../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.
" +"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 "" "Envio falhou porque o servidor tem uma nova versão de " -"um
de seus nós, caminhos ou relações..

Clique " -"{0} para sincronizar todos o conjuntos de dados locais com " -"o servidor.
Clique {1} para abortar e continuar " -"editando.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 +"um
de seus nós, caminhos ou relações..

Clique {0} para sincronizar todos o conjuntos de dados locais com o servidor." +"
Clique {1} para abortar e continuar editando.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1845,22 +2011,22 @@ "novo ou aberto." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 msgid "Changeset closed" msgstr "Changeset fechado" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 msgid "Prepare conflict resolution" msgstr "Preparar a resolução de conflitos" -#: ../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 +msgstr "Clique para cancelar e voltar a editar o mapa" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 #, java-format msgid "" @@ -1870,16 +2036,21 @@ "conflicts which you can resolve in the Conflict Resolution Dialog." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 +"O envio de dados falhou porque você tentou apagar o " +"nó {0} que ainda é usado pela via {1}.

Clique {2} " +"para baixar todas as vias que contém o nó {0}.
Se for necessário o JOSM " +"criará conflitos que você poderá resolver através da Janela de Resolução de " +"Conflitos." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 msgid "Node still in use" msgstr "Nó ainda em uso" -#: ../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 "Atualizando primitiva" @@ -1891,6 +2062,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 "" @@ -1898,41 +2069,46 @@ "object and retrying to upload." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 +"Aviso: objeto \"{0}\" já foi apagado no servidor. Ignorando esse objeto e " +"tentando novamente o envio de dados." + +#: ../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 +"Objeto \"{0}\" já foi apagado. Ignorando esse objeto no envio de dados." + +#: ../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 +msgstr "Enviando {0} objetos..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" +msgstr "" +"Ignorando exceção capturada porque o envio de dados foi cancelado. Exceção é " +"{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 msgid "Upload selection" msgstr "Enviar seleção" -#: ../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 +"Enviar todas as alterações presentes na seleção atual para o servidor OSM." + +#: ../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 +msgstr "Lendo os pais de \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:323 msgid "Checking for deleted parents in the local dataset" -msgstr "" +msgstr "Buscando pais apagados no grupo de dados local" #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:23 @@ -1943,5 +2119,5 @@ #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:25 msgid "Enable/disable rendering the map as wireframe only" -msgstr "" +msgstr "Habilite/desabilite a apresentação do mapa somente como esqueleto" #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26 @@ -2060,5 +2236,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." -msgstr "" +msgstr "Nenhum informação desta área encontrada" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66 @@ -2073,5 +2249,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157 msgid "Check on the server" -msgstr "" +msgstr "Verifique no servidor" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159 @@ -2080,4 +2256,6 @@ "server" msgstr "" +"Clique para verificar se há objetos de seu grupo de dados local que estejam " +"apagados no servidor" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163 @@ -2088,5 +2266,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165 msgid "Click to abort and to resume editing" -msgstr "" +msgstr "Clique para interromper e reiniciar a edição" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170 @@ -2096,6 +2274,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 "" "Existem {0} primitivas no seu conjunto de dados local que
podem ter " @@ -2113,5 +2291,5 @@ #, java-format msgid "The following errors occurred during mass download: {0}" -msgstr "" +msgstr "Os erros a seguir ocorreram durante a obtenção de dados em massa: {0}" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 @@ -2122,5 +2300,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" -msgstr "" +msgstr "Erros durante a obtenção de dados" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:93 @@ -2170,38 +2348,38 @@ msgstr "selecionado" -#: ../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 "Não é possível adicionar nó fora do planeta." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Adicionar nó" -#: ../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 "Adicionar nó no caminho" -#: ../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 "Conectar caminho existente a nó" -#: ../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 "Adicionar um novo nó a um caminho existente" -#: ../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 "Adicionar nó em um caminho e conectar" -#: ../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 "Criar novo nó." -#: ../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 "Selecionar nó sob o cursor." -#: ../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." @@ -2210,14 +2388,14 @@ msgstr[1] "Inserir novo nó em {0} caminhos." -#: ../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 "Começar novo caminho a partir do último nó." -#: ../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 "Continuar caminho a partir do último nó." -#: ../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 "Finalizar desenho." @@ -2238,5 +2416,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 msgid "Move a segment along its normal, then release the mouse button." -msgstr "" +msgstr "Mova um segmento sobre sua normal, então solte o botão do mouse." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2250,9 +2428,11 @@ "its normal." msgstr "" +"Carregue um segmento de via para criar um retângulo. Ctrl-carregar para " +"mover um segmento sobre sua normal." #: ../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 "" "Arraste a símbolo de reprodução e solte próximo à trilha para reproduzir " @@ -2358,8 +2538,8 @@ #. -- prepare the combo box with the search expressions -#. +#. #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." -msgstr "" +msgstr "Por favor digite um texto-filtro." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 @@ -2369,5 +2549,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "" +msgstr "Digite a expressão de pesquisa" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 @@ -2385,5 +2565,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" -msgstr "" +msgstr "encontre na seleção" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 @@ -2416,6 +2596,6 @@ "type=, *=*, *=" msgstr "" -"type=* - chave 'type' com qualquer valor. Tente também " -"*=value, type=, *=*, *=" +"type=* - chave 'type' com qualquer valor. Tente também *=value, type=, *=*, *=" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 @@ -2439,38 +2619,44 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" -msgstr "" -"user:... - todos os objetos modificados por determinado usuário" +msgstr "user:... - todos os objetos modificados por determinado usuário" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - todos os objetos modificados por determinado usuário" + +#: ../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 +msgstr "id:... - objeto com pedido ID (0 para novos objetos)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "nodes:... - object with given number of nodes" msgstr "nós:... - objeto com um determinado número de nós" -#: ../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-" "max)" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +"marcadores:... - objeto com o número pedido de marcadores (tags:count " +"ou tags:min-max)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "modified - all changed objects" msgstr "modificado - todos os objetos modificados" -#: ../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 "selecionados - todos os objetos selecionados" -#: ../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 "incompletos - todos os objetos incompletos" -#: ../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 "não tagueados - todos objetos não tagueados" -#: ../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" @@ -2478,5 +2664,5 @@ "child expr - todos objetos filhos que coincidem com a expressão" -#: ../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" @@ -2485,17 +2671,17 @@ "expressão" -#: ../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 "Use | ou OR para combinar com \"ou\" lógico" -#: ../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 "Usar \" para operadores de aspas (se a chave contém :)" -#: ../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 "Usar ( and ) para agrupar expressões" -#: ../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 @@ -2505,55 +2691,55 @@ msgstr "Filtro" -#: ../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 "Buscar" -#: ../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 +msgstr "Aplicar o filtro" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Start Search" msgstr "Iniciar Pesquisa" -#: ../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 "Não há valores coincidentes para ''{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 "Nada adicionado à seleção pela busca por \"{0}\"" -#: ../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 "Nada foi removido da seleção quando buscado por \"{0}\"" -#: ../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 +msgstr "Nada encontrado na seleção ao pesquisar por \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 #, java-format msgid "Found {0} matches" msgstr "Encontrados {0} resultados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2567,5 +2753,5 @@ "{2}" -#: ../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 "" @@ -2573,10 +2759,10 @@ "chave=valor" -#: ../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 +msgstr "Erro de sintaxe do padrão: padrão {0} em {1} é ilegal!" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2585,26 +2771,26 @@ "ou relação." -#: ../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 "Credencial de autenticação inesperada: {0}" -#: ../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 "Faltam argumentos para \"or\"" -#: ../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 "Falta argumento para \"not\"" -#: ../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 "Fechamento de parenteses esperado." -#: ../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 +msgstr "Número errado de parâmetros para o operador de tags" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 #, java-format msgid "" @@ -2613,9 +2799,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 "Número de parametros incorreto para operador de nós." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 #, java-format msgid "" @@ -2626,5 +2812,5 @@ "de nós ou um intervalo, por exemplos, os nós:10-20" -#: ../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." @@ -2675,8 +2861,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" +#, fuzzy, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" msgstr "" "Aviso: truncanto automaticamente o valor da tag ''{0}'' na primitiva " @@ -2684,7 +2869,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2704,5 +2889,5 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 msgid "Cyclic dependency between relations:" -msgstr "" +msgstr "Dependência cíclica entre as relações:" #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47 @@ -2716,13 +2901,13 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53 msgid "Relation ..." -msgstr "" +msgstr "Relação ..." #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54 msgid "... refers to relation" -msgstr "" +msgstr "... refere-se a uma relação" #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87 msgid "Cycling dependencies" -msgstr "" +msgstr "Dependências cíclicas" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 @@ -2744,5 +2929,5 @@ #, java-format msgid "Added {0} objects" -msgstr "" +msgstr "Adicionado {0} objetos" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 @@ -2825,5 +3010,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 "Conflito duplo" @@ -2842,5 +3027,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 "" @@ -2859,19 +3045,19 @@ msgstr "não foi possível resolver conflito não-definido" +#: ../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 "O parâmetro \"{0}\" não pode estar vazio" + #: ../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" @@ -2880,5 +3066,5 @@ msgstr[1] "Apagar {0} objetos" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2887,5 +3073,5 @@ msgstr[1] "Apagar {0} nós" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2894,5 +3080,5 @@ msgstr[1] "Apagar {0} caminhos" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2903,16 +3089,16 @@ #. 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?" +#: ../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 "" "Está a ponto de apagar nós fora da área que baixou.
Isto pode causar " -"problemas, já que outros objetos (que não pode ver) podem estar usando-" -"los.
Realmente quer apagar?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +"problemas, já que outros objetos (que não pode ver) podem estar usando-los." +"
Realmente quer apagar?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "Apagar confirmação" @@ -2930,15 +3116,15 @@ msgstr[1] "Mover {0} nós" -#: ../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 "" @@ -2949,5 +3135,5 @@ "Atualmente é {1}" -#: ../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}" @@ -2958,11 +3144,4 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Resolver conflitos na lista de membros da relação {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "" -"Não é possível desfazer comando \"{0}\" porque a camada \"{1}\" não está " -"mais presente" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3041,5 +3220,5 @@ msgstr "Aplicar?" -#: ../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 " @@ -3198,6 +3377,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 "" "O ficheiro de preferências contêm erros.
A fazer uma cópia de " @@ -3285,5 +3464,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3292,5 +3471,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3298,25 +3477,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 "S" #. 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 "N" #. 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 "O" #. 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 "L" #: ../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 @@ -3339,25 +3518,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}" @@ -3365,6 +3545,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 "" @@ -3427,24 +3607,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 " @@ -3452,5 +3632,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 "" @@ -3482,6 +3662,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}." @@ -3502,5 +3682,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 @@ -3512,6 +3691,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 "" @@ -3522,135 +3700,135 @@ msgstr "parâmetro ''{0}'' fora do intervalo de 0..{1}, obtido {2}" -#: ../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 "Caminho para Estilo de Área não está fechado." -#: ../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 "via multipolígonos \"{0}\" não está fechada." -#: ../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 "Apagado membro ''{0}'' na relação." -#: ../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 "Way ''{0}'' com menos de dois pontos." -#: ../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 "Mais de um caminho \"de\" encontrado." -#: ../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 "Mais de um caminho \"para\" encontrado." -#: ../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 "Encontrado mais de um parâmetro \"via\"." -#: ../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 "Regra desconhecida \"{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 "Tipo de membro desconhecido para \"{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 "Nenhum caminho \"de\" encontrado." -#: ../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 "Nenhuma caminho \"para\" encontrado." -#: ../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 "Não encontrei nenum nó ou caminho com o parâmetro \"via\"." -#: ../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 "O caminho \"de\" não começa ou termina em um nó \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../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 "O trecho \"to\" não começa ou termina no nó \"via\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "O trecho \"from\" não começa ou termina no caminho \"via\"" -#: ../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 "O trecho \"to\" não começa ou termina em um nó \"via\"." -#: ../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 "Estilo para restrição {0} não encontrado." -#: ../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 "Interseção entre as vias \"{0}\" e \"{1}\"." -#: ../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 "Via interna \"{0}\" está fora." -#: ../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 "Regra não aplicável ''{0}'' para Way ''{1}''." -#: ../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 "\"{0}\" não é um caminho no multipolígono." -#: ../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 "Não há via externa no multipolígono \"{0}\"." -#: ../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 "Estilo para caminho interno \"{0}\" é multipolígono." -#: ../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 "Estilo para via externa \"{0}\" contém erros." -#: ../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 "não tagueado" -#: ../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 "texto" -#: ../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 "Erro: {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}" @@ -3662,5 +3840,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 @@ -3679,5 +3857,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 @@ -3697,5 +3875,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 "segundo plano" @@ -3813,6 +3991,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 "" @@ -3827,5 +4004,5 @@ msgstr "Não mostrar novamente" -#: ../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 @@ -3833,32 +4010,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 "incompleto" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "rodovia" -#: ../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 "ferrovia" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "hidrovia" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "uso da terra" -#: ../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" @@ -3867,5 +4044,5 @@ msgstr[1] "{0} nós" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -4113,15 +4290,14 @@ #, java-format msgid "Preference setting {0} has been removed since it is no longer used." -msgstr "" -"Configuração {0} das preferências foi removida pois não é mais usada." - -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +msgstr "Configuração {0} das preferências foi removida pois não é mais usada." + +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Arquivo" -#: ../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 @@ -4135,19 +4311,19 @@ msgstr "Editar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Vista" -#: ../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 "Ferramentas" -#: ../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 "Predefinições" -#: ../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 @@ -4158,5 +4334,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Audio" @@ -4200,29 +4376,29 @@ msgstr "escala" -#: ../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 "A lontigute geográfica na posição do ponteiro do mouse." -#: ../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 "O nome do objeto na posição do ponteiro do mouse." -#: ../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 "A latitude geográfica na posição do ponteiro do mouse." -#: ../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 "O ângulo entre o segmento anterior e o atual." -#: ../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 "A direção (bússola) do segmento de linha que está sendo desenhado." -#: ../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 "O comprimento do novo caminho que está sendo desenhado." -#: ../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 " @@ -4230,9 +4406,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(nenhum objeto)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "Usuário:" @@ -4340,5 +4516,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" @@ -4347,5 +4523,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" @@ -4354,5 +4530,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" @@ -4371,5 +4547,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 @@ -4386,5 +4562,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" @@ -4460,22 +4636,22 @@ msgstr "Resolução de Conflito" -#: ../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 "parâmetro atual fora do intervalo: obtido {0}" -#: ../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 "lista em regra {0} não está participando de um par comparado" -#: ../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 "valor inesperado do parâmetro \"index\": {0}" -#: ../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." @@ -4529,6 +4705,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" -msgstr "" -"Copiar meus nós selecionados para o início da lista de nós combinados" +msgstr "Copiar meus nós selecionados para o início da lista de nós combinados" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 @@ -4566,6 +4741,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 "" "Copiar os elementos selecionados deles para o fim da lista de elementos " @@ -4640,6 +4814,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" "Clique {0} para começar a combinar as minhas entradas " @@ -4649,6 +4823,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" "Clique {0} para terminar de combinar as minhas " @@ -4709,9 +4883,9 @@ #, java-format msgid "" -"An error occurred while communicating with the server
Details: " -"{0}" -msgstr "" -"Um erro ocorreu durante a comunicação com o servidor.
Detalhes: " -"{0}" +"An error occurred while communicating with the server
Details: {0}" +msgstr "" +"Um erro ocorreu durante a comunicação com o servidor.
Detalhes: {0}" +"" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 @@ -4746,7 +4920,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 "" "Existem {0} primitivas adicionais referentes à relação {1}
que " @@ -4898,5 +5072,5 @@ msgstr "Primitivo" -#: ../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 "" @@ -5033,5 +5207,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 "Aplicar" @@ -5131,7 +5305,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" @@ -5141,6 +5315,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" @@ -5174,7 +5348,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 "Regra:" @@ -5263,5 +5435,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 @@ -5328,10 +5500,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 "" @@ -5406,18 +5577,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 "Histórico" -#: ../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 "Mostrar histórico de todos itens selecionados." -#: ../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 @@ -5427,13 +5598,13 @@ msgstr "Recarregar" -#: ../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 "Recarregar todos objetos selecionados e atualizar a lista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303 msgid "Show" msgstr "Mostrar" -#: ../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 "" @@ -5626,5 +5797,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 "Criar uma cópia desta relação e abri-la em outra janela de edição" @@ -5667,25 +5838,25 @@ msgstr "Zoom para seleção." -#: ../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 "Sel.: Rel.:{0} / Vias:{1} / Nós:{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 "Seleção" -#: ../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 "Seleção: {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 "Desacoplar painel" -#: ../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." @@ -5693,5 +5864,5 @@ "Fechar este painel. Você pode reabri-lo com os botões da barra da esquerda." -#: ../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 "Clique para minimizar/maximizar o conteúdo do painel" @@ -5751,37 +5922,37 @@ msgstr "Nº de objetos" -#: ../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 "Editar relação referente à relação selecionada atualmente" -#: ../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 "Baixar relações selecionadas" -#: ../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 "Baixar membros do relaçoe" -#: ../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 "Conflitos nos dados" -#: ../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 "" @@ -5790,63 +5961,91 @@ 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 "Relação está apagada" -#: ../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 "Baixando relação {0}" -#: ../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 "Aviso: ignorando exceção porque tarefa foi cancelada. Exceção: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +#: ../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] "Baixar todas vias imcompletas e nós desta relação" +msgstr[1] "Baixar todas vias imcompletas e nós desta relação" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Baixar membros do relaçoe" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "Baixando relação {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 msgid "Tags and Members" msgstr "Tags e Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Parent Relations" msgstr "Relações de parentesco" -#: ../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 "Aplicar papel" + +#: ../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 "Definir uma papel para membros selecionados" + +#: ../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 "Apagá-los, limpar relação" -#: ../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 "Ignorá-los, deixar relação como está" -#: ../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 "Múltiplos membros referenciando a mesma primitiva" -#: ../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 "" @@ -5856,5 +6055,5 @@ 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" @@ -5863,5 +6062,5 @@ "membro" -#: ../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" @@ -5870,5 +6069,5 @@ "membro" -#: ../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 " @@ -5878,5 +6077,5 @@ "membro selecionado" -#: ../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 " @@ -5886,20 +6085,20 @@ "membro selecionado" -#: ../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 "Editor de Relações: Remover Selecionada" -#: ../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 "" @@ -5908,66 +6107,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 "Classificar a relação de membros" -#. 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 "Esportes" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 msgid "Relation Editor: Sort" msgstr "Editor de Relações: Classificar" -#: ../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 "Mover os membros selecionados para cima" #. 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 "Editor de Relações: Mover para cima" -#: ../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 "Mover membros selecionados para baixo" #. 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 "Editor de Relações: Mover para Baixo" -#: ../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 "Editor de Relações: Remover" -#: ../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 " @@ -5976,53 +6179,60 @@ 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 "Aplicar atualizações e fechar aviso" -#: ../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 "Cancelar atualizações e fechar janela" -#: ../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 "Adicionar uma tag vazia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 -msgid "Download all incomplete ways and nodes in relation" -msgstr "Baixar todas vias imcompletas e nós desta relação" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#, fuzzy +msgid "Download all incomplete members" +msgstr "Baixar membros do relaçoe" + +#: ../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 "Baixar membros" -#: ../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 "Editor de Relações: Baixar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#, fuzzy +msgid "Download selected incomplete members" +msgstr "Baixar membros do relaçoe" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 msgid "Sets a role for the selected members" msgstr "Definir uma papel para membros selecionados" -#: ../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 "Aplicar papel" -#: ../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 "" @@ -6032,41 +6242,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 "Editar relação referente à relação selecionada atualmente" -#. 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 "Zoom para" -#: ../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 "" @@ -6106,19 +6309,19 @@ msgstr "Editar relação selecionada atualmente" -#: ../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 "Aplicar modificações" -#: ../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 "Criar nova relação na camada ''{0}''" -#: ../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 "Editar nova relação na camada''{0}''" -#: ../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}''" @@ -6130,6 +6333,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 "" @@ -6311,7 +6513,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 "" @@ -7084,5 +7285,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 @@ -7319,6 +7520,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 "" @@ -7328,6 +7529,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 "" @@ -7595,13 +7796,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}" @@ -7702,6 +7903,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 "" @@ -7786,6 +7986,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] "" @@ -7799,6 +7999,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 " @@ -7853,5 +8053,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 " @@ -7859,5 +8059,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 "" @@ -7930,40 +8130,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 "Enviar" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 msgid "Settings" msgstr "Configurações" -#: ../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 "Objetos a adicionar:" -#: ../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 "Objetos a modificar:" -#: ../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 "Objetos a excluir:" -#: ../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:" @@ -7972,5 +8172,5 @@ msgstr[1] "{0} objectos a acrescentar:" -#: ../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:" @@ -7979,5 +8179,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:" @@ -7986,70 +8186,67 @@ msgstr[1] "{0} objectos a apagar:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 msgid "Upload Changes" msgstr "Enviar Modificações" -#: ../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 "Por favor, entre com as coordenadas desejadas primeiro." + +#: ../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 "" -"Habilitar para envio de todas modificações em uma chamada, desabilitar para " -"usar uma chamada por primitiva" - -#: ../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 "Faça um comentário breve sobre as mudanças que está enviando:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../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 "Enviar dados para um changeset aberto" -#: ../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}" @@ -8057,16 +8254,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}." @@ -8074,6 +8271,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 "" @@ -8082,5 +8279,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 "" @@ -8110,111 +8307,57 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Imagens para {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "Ler GPX..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Sem tempo para ponto {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 "Não foi possível ler tempo \"{0}\" para ponto {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 "Lendo {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Não foram encontradas imagens com dados de tempo legíveis" - -#: ../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 "Imagens Geotagueadas" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "Iniciar GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "Finalizar GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "delta atual: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "diferença de zona horária: " - -#: ../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] "imagem" -msgstr[1] "imagens" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} dentro da faixa" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Sincronizar relógio" - -#: ../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 "Imagens JPEG (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "A data no arquivo \"{0}\" não pode ser analisada." - -#: ../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 "Imagem" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Digite data de exibição (mm/dd/aaaa HH:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "Zona horária do GPS (diferença com foto)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Sincronizar Tempo com Unidade GPS" - -#: ../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 "O tempo informado não pode ser analisado." - -#: ../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 +#, fuzzy +msgid "Upload data in one request" +msgstr "Enviar dados para um changeset aberto" + +#: ../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 +#, fuzzy +msgid "(1 request)" +msgstr "Requisição inválida" + +#: ../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} metros" +msgstr[1] "{0} metros" + +#: ../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 "Por favor digite um texto-filtro." + +#: ../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 @@ -8222,30 +8365,30 @@ msgstr "ponto 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 "Personalizar linha" -#: ../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 "Usar preferências globais." -#: ../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 "Desenhar linhas entre pontos para esta camada." -#: ../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 "Não desenhar linhas entre pontos para esta camada." -#: ../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 "Selecionar opções de linha" -#: ../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 @@ -8253,5 +8396,5 @@ msgstr "Personalizar cores" -#: ../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 @@ -8260,5 +8403,5 @@ msgstr "Padrão" -#: ../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 @@ -8267,58 +8410,63 @@ msgstr "Selecionar uma cor" -#: ../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 "Marcadores de Pontos Nomeados" -#: ../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 "Importar Áudio" -#: ../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 "Árquivos de Áudio WAV (*.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 "Marcadores de audio de {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 "Importar imagens" -#: ../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 "Imagens JPEG (*.jpg)" + +#: ../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 "Nome: {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 @@ -8326,5 +8474,5 @@ msgstr "Descrição: {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" @@ -8334,5 +8482,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 @@ -8340,22 +8488,17 @@ msgstr "Descrição" -#: ../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 "URL" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443 msgid "Length: " msgstr "Comprimento: " -#: ../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, " @@ -8364,5 +8507,5 @@ msgstr[1] "{0} rotas, " -#: ../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" @@ -8371,24 +8514,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 "Converter para camada de dados" -#: ../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:" +#: ../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 "" "O envio de dados não processados de GPS como mapa é considerado " "arriscado.
Se quiser enviar dados, consulte aqui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 (EN)" -#: ../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 @@ -8398,29 +8541,29 @@ msgstr "Convertido de: {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 "Descarregar do OSM ao largo desta via" -#: ../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 "Descargar tudo entre:" -#: ../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} metros" -#: ../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 "Área máxima por pedio:" -#: ../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} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8431,9 +8574,9 @@ "Você deseja
continuar? " -#: ../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 "Não há trilha GPX disponível na camada para associar áudio." -#: ../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 " @@ -8441,5 +8584,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 " @@ -8447,23 +8590,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 "Camada de dados {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 "fora da área baixada" -#: ../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 "versão {0}" -#: ../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 "Atenção: misturando dados de versões 0.6 e 0.5 na versão 0.5" -#: ../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." @@ -8472,5 +8615,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 "" @@ -8484,5 +8627,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 "" @@ -8495,11 +8638,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" @@ -8508,32 +8651,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} consiste em:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 msgid "unset" msgstr "remover definição" -#: ../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 "Versão API: {0}" -#: ../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 "Converter para camada GPX" -#: ../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 "" @@ -8541,6 +8684,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 "" @@ -8579,4 +8722,345 @@ msgstr[1] "{0} pontos" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "Arcivo GPX (*.gpx *.gpx.gz)" + +#: ../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 "Erro enquanto analisava {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Não foi possível ler \"{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 "Sem data" + +#: ../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 "Data inválida" + +#: ../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 "Deslocamento:" + +#: ../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 "Todas as imagens" + +#: ../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 "Valores Predefinidos" + +#: ../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 "Lendo {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 "Imagens Geotagueadas" + +#: ../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] "imagem" +msgstr[1] "imagens" + +#: ../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 "Nenhuma imagem" + +#: ../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 "Imagens Geotagueadas" + +#: ../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 "Anterior" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Remover foto da camada" + +#: ../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 "Próximo" + +#: ../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 "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8822,6 +9306,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104 msgid "The amount by which the speed is multiplied for fast forwarding" -msgstr "" -"O montante pelo qual a velocidade é multiplicada para o avanço rápido" +msgstr "O montante pelo qual a velocidade é multiplicada para o avanço rápido" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105 @@ -8889,5 +9372,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 @@ -9079,6 +9562,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 "" @@ -9139,6 +9621,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 "" @@ -9206,18 +9687,18 @@ #: ../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 "Aparência" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 -msgid "Default (Auto determined)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 msgid "Language" msgstr "Idioma" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:112 +#: ../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 "" @@ -9477,6 +9958,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 "" @@ -9539,6 +10020,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 "" @@ -9551,9 +10032,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 "" @@ -9577,6 +10057,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 "" @@ -9669,5 +10149,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 "Mais informações sobre esta característica" @@ -9754,5 +10234,5 @@ msgstr "Baixando pontos {0} a {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 @@ -9760,5 +10240,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9880,14 +10360,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 @@ -9915,24 +10394,31 @@ 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] "Baixando pontos {0} a {1}..." +msgstr[1] "Baixando pontos {0} a {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9974,27 +10460,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 "" @@ -10002,66 +10488,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 "Fechando conjunto de mudanças..." -#: ../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 "Preparando..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Enviando..." -#: ../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 "Changeset atual é nulo. Não há como enviar os dados." -#: ../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}." @@ -10096,5 +10582,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}''." @@ -10121,5 +10607,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}." @@ -10127,5 +10613,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}" @@ -10138,5 +10624,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}''." @@ -10194,7 +10680,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 "" @@ -10222,6 +10708,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 "" @@ -10287,46 +10773,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 "" @@ -10334,19 +10819,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 "Especificação de incompleta com ref=0" -#: ../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 "Objeto ilegal com 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 "" @@ -10356,8 +10841,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 "" @@ -10367,25 +10852,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 "" @@ -10393,5 +10878,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10400,5 +10885,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10406,5 +10891,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10413,13 +10898,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 "Preparando dados OSM..." -#: ../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 "" @@ -10472,4 +10957,10 @@ msgid "Contacting Server..." msgstr "Acessando Servidor..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 +#, fuzzy, java-format +msgid "Expected value > 0 for parameter ''{0}'', got {1}" +msgstr "valor inesperado do parâmetro \"index\": {0}" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10509,42 +11000,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 +#, fuzzy, java-format +msgid "Value >0 expected for parameter ''{0}'', got {1}" +msgstr "valor inesperado do parâmetro \"index\": {0}" + +#: ../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 +#, fuzzy, java-format +msgid "({0}/{1}) Uploading {2} objects..." +msgstr "Enviando {0} objetos..." + +#: ../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 "" @@ -10586,17 +11078,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 "Apagar {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}." @@ -10608,19 +11110,18 @@ msgstr "Um erro ocorreu com o plugin {0}" -#: ../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" @@ -10629,50 +11130,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 "Última atualização de plugin há mais de {0} dias." -#: ../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 "O plugin {0} é requerido pelo plugin {1} mas não foi encontrado." -#: ../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 "Plugin não encontrado: {0}." -#: ../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 "Não foi possível carregar plugin {0}. Apagar das preferências?" -#: ../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 "Desabilitar plugin" -#: ../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 " @@ -10682,9 +11183,9 @@ "de sobreescrever os existentes." -#: ../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 "" @@ -10692,10 +11193,10 @@ msgstr "Uma exceção não esperada pode ter ocorrido devido ao plugin ''{0}''." -#: ../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 "De acordo com as informações no plugin, o autor é {0}." -#: ../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." @@ -10704,9 +11205,9 @@ "bug." -#: ../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 "O plugin deve ser desabilitado?" -#: ../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 " @@ -10716,13 +11217,13 @@ "desativar o plugin." -#: ../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 "Informações sobre o plugin" -#: ../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" @@ -10841,6 +11342,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 "" @@ -10878,6 +11379,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 "" "Envio ao servidor falhou porque seu conjunto
de " @@ -10943,7 +11444,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 "" @@ -10955,7 +11455,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 "" @@ -10987,6 +11487,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 "" @@ -11246,5 +11746,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" @@ -11259,12 +11759,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 "Ímpar" -#: ../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 @@ -11272,442 +11770,142 @@ msgstr "Par" -#: ../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 "Número" + +#. 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 +msgid "Actual" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "Ativar" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Aluguel" + +#: ../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 "segmento interno" + +#: ../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 "Anterior" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Remover foto da camada" - -#: ../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 "Próximo" - -#: ../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 "" -"\n" -"{0} km/h" - -#: ../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 "Carregar grupo de imagens como nova camada." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "Arcivo GPX (*.gpx *.gpx.gz)" - -#: ../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 "Erro enquanto analisava {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Não foi possível ler \"{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 "Sem data" - -#: ../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 "Data inválida" - -#: ../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 "Deslocamento:" - -#: ../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 "Todas as imagens" - -#: ../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 "Valores Predefinidos" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433 -msgid "No image" -msgstr "Nenhuma imagem" - -#: ../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 "" @@ -11852,11 +12050,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 "" @@ -12165,12 +12362,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 @@ -12282,14 +12471,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 " @@ -12597,4 +12786,8 @@ msgstr "" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Carregar grupo de imagens como nova camada." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -12638,18 +12831,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" @@ -12698,7 +12891,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12708,5 +12901,5 @@ #. 50000 #. -#. +#. #. #. @@ -12716,5 +12909,5 @@ #. 50000 #. -#. +#. #. #. @@ -12723,5 +12916,5 @@ #. 50000 #. -#. +#. #. #. @@ -12731,5 +12924,5 @@ #. 50000 #. -#. +#. #. #. @@ -12748,5 +12941,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 msgid "land" -msgstr "terra" +msgstr "ilha" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40 @@ -12807,6 +13000,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 "" @@ -12825,7 +13017,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 "" @@ -12887,20 +13078,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 "Conectando" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Conectado" -#. 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 "Não conectada" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "Conexão falhou" @@ -13117,6 +13307,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 "" @@ -13197,9 +13386,10 @@ msgstr "Extensão de arquivo desconhecida: {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 "Osmarender" -#: ../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 " @@ -13207,9 +13397,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 "" @@ -13582,17 +13768,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 "" @@ -13637,160 +13823,4 @@ msgstr "Opcional" -#: ../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 "Entrada de valores para todos conflitos" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Resolver conflitos" - -#: ../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 "Você tem certeza?" - #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:93 @@ -13885,5 +13915,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}" @@ -13936,34 +13966,34 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../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:197 +#: ../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:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Nada" +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +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 "" @@ -14014,18 +14044,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 "Confirmação" @@ -14254,7 +14284,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 "" @@ -14397,5 +14426,5 @@ #. 50000 #. -#. +#. #. #. @@ -14403,5 +14432,5 @@ #. #. -#. +#. #. #. @@ -14411,5 +14440,5 @@ #. 50000 #. -#. +#. #. #. @@ -14418,5 +14447,5 @@ #. 50000 #. -#. +#. #. #. @@ -14425,5 +14454,5 @@ #. 50000 #. -#. +#. #. #. @@ -14432,5 +14461,5 @@ #. 50000 #. -#. +#. #. #. @@ -14439,5 +14468,5 @@ #. 50000 #. -#. +#. #. #. @@ -14446,9 +14475,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14493,5 +14522,5 @@ #. 50000 #. -#. +#. #. #. @@ -14625,14 +14654,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 " @@ -14641,14 +14670,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 "" @@ -14657,5 +14686,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 "" @@ -14667,13 +14696,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." @@ -14827,50 +14856,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 "Erro ao carregar arquivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -14946,5 +14975,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 "" @@ -14982,21 +15011,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 " @@ -15008,21 +15032,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 " @@ -15031,10 +15055,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 " @@ -15043,21 +15067,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 " @@ -15067,16 +15090,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 " @@ -15086,10 +15109,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 " @@ -15098,5 +15121,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 " @@ -15106,27 +15129,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 " @@ -15135,15 +15158,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 +msgid "Let other applications send commands to JOSM." +msgstr "" + +#. Plugin routes #: build/trans_plugins.java:55 -msgid "Let other applications send commands to JOSM." -msgstr "" - -#. Plugin routes -#: build/trans_plugins.java:57 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15152,10 +15175,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 " @@ -15164,15 +15187,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 " @@ -15182,17 +15205,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 " @@ -15201,5 +15217,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15208,10 +15224,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, ...)." @@ -16264,8 +16280,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16462,5 +16478,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16470,5 +16486,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16487,5 +16503,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16495,5 +16511,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16512,5 +16528,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16520,5 +16536,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16537,5 +16553,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16545,5 +16561,5 @@ #. 300000 #. -#. +#. #. #. @@ -16558,5 +16574,5 @@ #. 300000 #. -#. +#. #. #. @@ -16574,5 +16590,5 @@ #. 50000 #. -#. +#. #. #. @@ -16590,5 +16606,5 @@ #. 40000 #. -#. +#. #. #. @@ -16597,5 +16613,5 @@ #. 40000 #. -#. +#. #. #. @@ -16605,5 +16621,5 @@ #. 50000 #. -#. +#. #. #. @@ -16623,5 +16639,5 @@ #. 50000 #. -#. +#. #. #. @@ -16630,5 +16646,5 @@ #. 50000 #. -#. +#. #. #. @@ -16638,5 +16654,5 @@ #. 50000 #. -#. +#. #. #. @@ -16686,7 +16702,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17385,5 +17401,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17422,5 +17438,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17516,5 +17532,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17671,5 +17687,5 @@ #. 50000 #. -#. +#. #. #. @@ -18714,5 +18730,5 @@ #: build/trans_presets.java:1578 msgid "Travel" -msgstr "" +msgstr "Viagem" #. group "Travel" @@ -19056,5 +19072,5 @@ #. 30000 #. -#. +#. #. #. @@ -19064,5 +19080,5 @@ #. 40000 #. -#. +#. #. #. @@ -19072,5 +19088,5 @@ #. 20000 #. -#. +#. #. #. @@ -19080,5 +19096,5 @@ #. 40000 #. -#. +#. #. #. @@ -19436,7 +19452,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19446,5 +19462,5 @@ #. 50000 #. -#. +#. #. #. @@ -19454,5 +19470,5 @@ #. 50000 #. -#. +#. #. #. @@ -19462,5 +19478,5 @@ #. 50000 #. -#. +#. #. #. @@ -19470,5 +19486,5 @@ #. 50000 #. -#. +#. #. #. @@ -19478,5 +19494,5 @@ #. 50000 #. -#. +#. #. #. @@ -19486,5 +19502,5 @@ #. 50000 #. -#. +#. #. #. @@ -19494,5 +19510,5 @@ #. 50000 #. -#. +#. #. #. @@ -19502,5 +19518,5 @@ #. 50000 #. -#. +#. #. #. @@ -19510,5 +19526,5 @@ #. 50000 #. -#. +#. #. #. @@ -19518,5 +19534,5 @@ #. 50000 #. -#. +#. #. #. @@ -19526,5 +19542,5 @@ #. 50000 #. -#. +#. #. #. @@ -19534,5 +19550,5 @@ #. 50000 #. -#. +#. #. #. @@ -19542,5 +19558,5 @@ #. 50000 #. -#. +#. #. #. @@ -19550,5 +19566,5 @@ #. 50000 #. -#. +#. #. #. @@ -19558,5 +19574,5 @@ #. 50000 #. -#. +#. #. #. @@ -19566,5 +19582,5 @@ #. 50000 #. -#. +#. #. #. @@ -19574,5 +19590,5 @@ #. 50000 #. -#. +#. #. #. @@ -19582,5 +19598,5 @@ #. 50000 #. -#. +#. #. #. @@ -19590,5 +19606,5 @@ #. 50000 #. -#. +#. #. #. @@ -19598,5 +19614,5 @@ #. 50000 #. -#. +#. #. #. @@ -19606,5 +19622,5 @@ #. 50000 #. -#. +#. #. #. @@ -19614,5 +19630,5 @@ #. 50000 #. -#. +#. #. #. @@ -19622,5 +19638,5 @@ #. 50000 #. -#. +#. #. #. @@ -19630,5 +19646,5 @@ #. 50000 #. -#. +#. #. #. @@ -19638,5 +19654,5 @@ #. 50000 #. -#. +#. #. #. @@ -19646,5 +19662,5 @@ #. 50000 #. -#. +#. #. #. @@ -19654,5 +19670,5 @@ #. 50000 #. -#. +#. #. #. @@ -19662,5 +19678,5 @@ #. 50000 #. -#. +#. #. #. @@ -19670,5 +19686,5 @@ #. 50000 #. -#. +#. #. #. @@ -19678,5 +19694,5 @@ #. 50000 #. -#. +#. #. #. @@ -19686,5 +19702,5 @@ #. 50000 #. -#. +#. #. #. @@ -19694,5 +19710,5 @@ #. 50000 #. -#. +#. #. #. @@ -19702,5 +19718,5 @@ #. 50000 #. -#. +#. #. #. @@ -19710,5 +19726,5 @@ #. 50000 #. -#. +#. #. #. @@ -19718,5 +19734,5 @@ #. 50000 #. -#. +#. #. #. @@ -19726,5 +19742,5 @@ #. 50000 #. -#. +#. #. #. @@ -19734,5 +19750,5 @@ #. 50000 #. -#. +#. #. #. @@ -19742,5 +19758,5 @@ #. 50000 #. -#. +#. #. #. @@ -19750,5 +19766,5 @@ #. 50000 #. -#. +#. #. #. @@ -19758,5 +19774,5 @@ #. 50000 #. -#. +#. #. #. @@ -19766,5 +19782,5 @@ #. 50000 #. -#. +#. #. #. @@ -19774,5 +19790,5 @@ #. 50000 #. -#. +#. #. #. @@ -19782,5 +19798,5 @@ #. 50000 #. -#. +#. #. #. @@ -19790,5 +19806,5 @@ #. 50000 #. -#. +#. #. #. @@ -19798,5 +19814,5 @@ #. 50000 #. -#. +#. #. #. @@ -19806,5 +19822,5 @@ #. 50000 #. -#. +#. #. #. @@ -21498,7 +21514,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21508,5 +21524,5 @@ #. 50000 #. -#. +#. #. #. @@ -21516,5 +21532,5 @@ #. 50000 #. -#. +#. #. #. @@ -21524,5 +21540,5 @@ #. 50000 #. -#. +#. #. #. @@ -21532,5 +21548,5 @@ #. 50000 #. -#. +#. #. #. @@ -21540,5 +21556,5 @@ #. 50000 #. -#. +#. #. #. @@ -21548,5 +21564,5 @@ #. 50000 #. -#. +#. #. #. @@ -21556,5 +21572,5 @@ #. 50000 #. -#. +#. #. #. @@ -21714,10 +21730,10 @@ #: build/trans_presets.java:2542 msgid "Travel Agency" -msgstr "" +msgstr "Agência de Viagem" #. item "Shops/Travel Agency" #: build/trans_presets.java:2543 msgid "Edit Travel Agency" -msgstr "" +msgstr "Editar Agência de Viagem" #: build/trans_presets.java:2548 @@ -22165,5 +22181,5 @@ #: build/trans_presets.java:2788 msgid "Geography" -msgstr "" +msgstr "Geografia" #. group "Geography" @@ -22837,5 +22853,5 @@ #: build/trans_presets.java:3171 msgid "only_left_turn" -msgstr "somente_a_esuqerda" +msgstr "somente_a_esquerda" #: build/trans_presets.java:3171 @@ -22885,5 +22901,5 @@ #. 40000 #. -#. +#. #. #. @@ -22899,5 +22915,5 @@ #. 30000 #. -#. +#. #. #. @@ -22908,7 +22924,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22918,5 +22934,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22926,13 +22950,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22942,5 +22958,5 @@ #. 50000 #. -#. +#. #. #. @@ -22973,5 +22989,5 @@ #. 50000 #. -#. +#. #. #. @@ -22987,5 +23003,5 @@ #. 50000 #. -#. +#. #. #. @@ -22995,5 +23011,5 @@ #. 10000 #. -#. +#. #. #. @@ -23003,5 +23019,5 @@ #. 10000 #. -#. +#. #. #. @@ -23012,5 +23028,5 @@ #. 10000 #. -#. +#. #. #. @@ -23039,5 +23055,5 @@ #. 50000 #. -#. +#. #. #. @@ -23152,9 +23168,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 @@ -23162,5 +23178,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, @@ -23170,8 +23186,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 @@ -23185,5 +23201,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23191,5 +23207,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23238,6 +23254,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23317,5 +23333,5 @@ #. 40000 #. -#. +#. #. #. @@ -23325,5 +23341,5 @@ #. 10000 #. -#. +#. #. #. @@ -23332,5 +23348,5 @@ #. 50000 #. -#. +#. #. #. @@ -23340,5 +23356,5 @@ #. 50000 #. -#. +#. #. #. @@ -23347,5 +23363,5 @@ #. 50000 #. -#. +#. #. #. @@ -23354,5 +23370,5 @@ #. 50000 #. -#. +#. #. #. @@ -23361,5 +23377,5 @@ #. 50000 #. -#. +#. #. #. @@ -23368,5 +23384,5 @@ #. 50000 #. -#. +#. #. #. @@ -23375,5 +23391,5 @@ #. 40000 #. -#. +#. #. #. @@ -23382,5 +23398,5 @@ #. 50000 #. -#. +#. #. #. @@ -23389,5 +23405,5 @@ #. 50000 #. -#. +#. #. #. @@ -23396,5 +23412,5 @@ #. 50000 #. -#. +#. #. #. @@ -23403,5 +23419,5 @@ #. 50000 #. -#. +#. #. #. @@ -23410,5 +23426,5 @@ #. 50000 #. -#. +#. #. #. @@ -23417,5 +23433,5 @@ #. 50000 #. -#. +#. #. #. @@ -23425,5 +23441,5 @@ #. 50000 #. -#. +#. #. #. @@ -23432,5 +23448,5 @@ #. 50000 #. -#. +#. #. #. @@ -23441,5 +23457,5 @@ #. 50000 #. -#. +#. #. #. @@ -23451,11 +23467,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23464,7 +23480,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23475,5 +23491,5 @@ #. 50000 #. -#. +#. #. #. @@ -23484,5 +23500,5 @@ #. 50000 #. -#. +#. #. #. @@ -23493,5 +23509,5 @@ #. 50000 #. -#. +#. #. #. @@ -23502,5 +23518,5 @@ #. 50000 #. -#. +#. #. #. @@ -23511,5 +23527,5 @@ #. 50000 #. -#. +#. #. #. @@ -23520,5 +23536,5 @@ #. 40000 #. -#. +#. #. #. @@ -23530,5 +23546,5 @@ #. 50000 #. -#. +#. #. #. @@ -23539,5 +23555,5 @@ #. 50000 #. -#. +#. #. #. @@ -23562,5 +23578,5 @@ #. 10000 #. -#. +#. #. #. @@ -23569,5 +23585,5 @@ #. 50000 #. -#. +#. #. #. @@ -23576,5 +23592,5 @@ #. 50000 #. -#. +#. #. #. @@ -23590,5 +23606,5 @@ #. 20000 #. -#. +#. #. #. @@ -23602,5 +23618,5 @@ #. 30000 #. -#. +#. #. #. @@ -23609,5 +23625,5 @@ #. 50000 #. -#. +#. #. #. @@ -23616,5 +23632,5 @@ #. 50000 #. -#. +#. #. #. @@ -23623,5 +23639,5 @@ #. 50000 #. -#. +#. #. #. @@ -23630,5 +23646,5 @@ #. 50000 #. -#. +#. #. #. @@ -23637,5 +23653,5 @@ #. 50000 #. -#. +#. #. #. @@ -23644,5 +23660,5 @@ #. 50000 #. -#. +#. #. #. @@ -23651,5 +23667,5 @@ #. 50000 #. -#. +#. #. #. @@ -23658,5 +23674,5 @@ #. 50000 #. -#. +#. #. #. @@ -23665,5 +23681,5 @@ #. 50000 #. -#. +#. #. #. @@ -23672,5 +23688,5 @@ #. 50000 #. -#. +#. #. #. @@ -23679,5 +23695,5 @@ #. 50000 #. -#. +#. #. #. @@ -23686,5 +23702,5 @@ #. 50000 #. -#. +#. #. #. @@ -23693,5 +23709,5 @@ #. 50000 #. -#. +#. #. #. @@ -23700,5 +23716,5 @@ #. 50000 #. -#. +#. #. #. @@ -23869,7 +23885,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23883,5 +23899,5 @@ #. 40000 #. -#. +#. #. #. @@ -23891,7 +23907,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23901,5 +23917,5 @@ #. 50000 #. -#. +#. #. #. @@ -23909,5 +23925,5 @@ #. 50000 #. -#. +#. #. #. @@ -23917,5 +23933,5 @@ #. 50000 #. -#. +#. #. #. @@ -23925,5 +23941,5 @@ #. 50000 #. -#. +#. #. #. @@ -23939,5 +23955,5 @@ #. 10000 #. -#. +#. #. #. @@ -23947,5 +23963,5 @@ #. 50000 #. -#. +#. #. #. @@ -23955,5 +23971,5 @@ #. 50000 #. -#. +#. #. #. @@ -23963,5 +23979,5 @@ #. 50000 #. -#. +#. #. #. @@ -23971,5 +23987,5 @@ #. 50000 #. -#. +#. #. #. @@ -23979,5 +23995,5 @@ #. 50000 #. -#. +#. #. #. @@ -23987,5 +24003,5 @@ #. 50000 #. -#. +#. #. #. @@ -24004,5 +24020,5 @@ #. 50000 #. -#. +#. #. #. @@ -24011,5 +24027,5 @@ #. 50000 #. -#. +#. #. #. @@ -24023,5 +24039,5 @@ #. 50000 #. -#. +#. #. #. @@ -24035,5 +24051,5 @@ #. 50000 #. -#. +#. #. #. @@ -24042,5 +24058,5 @@ #. 50000 #. -#. +#. #. #. @@ -24054,5 +24070,5 @@ #. 50000 #. -#. +#. #. #. @@ -24067,5 +24083,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24080,5 +24096,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24092,5 +24108,5 @@ #. 50000 #. -#. +#. #. #. @@ -24104,5 +24120,5 @@ #. 50000 #. -#. +#. #. #. @@ -24111,5 +24127,5 @@ #. 50000 #. -#. +#. #. #. @@ -24118,5 +24134,5 @@ #. 50000 #. -#. +#. #. #. @@ -24130,5 +24146,5 @@ #. 50000 #. -#. +#. #. #. @@ -24138,5 +24154,5 @@ #. 50000 #. -#. +#. #. #. @@ -24145,5 +24161,5 @@ #. 50000 #. -#. +#. #. #. @@ -24152,5 +24168,5 @@ #. 50000 #. -#. +#. #. #. @@ -24159,5 +24175,5 @@ #. 50000 #. -#. +#. #. #. @@ -24167,5 +24183,5 @@ #. 50000 #. -#. +#. #. #. @@ -24176,5 +24192,5 @@ #. 50000 #. -#. +#. #. #. @@ -24184,7 +24200,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24194,5 +24210,5 @@ #. 50000 #. -#. +#. #. #. @@ -24202,5 +24218,5 @@ #. 50000 #. -#. +#. #. #. @@ -24210,5 +24226,5 @@ #. 50000 #. -#. +#. #. #. @@ -24219,5 +24235,5 @@ #. 50000 #. -#. +#. #. #. @@ -24227,5 +24243,5 @@ #. 50000 #. -#. +#. #. #. @@ -24235,5 +24251,5 @@ #. 50000 #. -#. +#. #. #. @@ -24243,5 +24259,5 @@ #. 50000 #. -#. +#. #. #. @@ -24251,5 +24267,5 @@ #. 50000 #. -#. +#. #. #. @@ -24259,5 +24275,5 @@ #. 50000 #. -#. +#. #. #. @@ -24267,5 +24283,5 @@ #. 50000 #. -#. +#. #. #. @@ -24275,5 +24291,5 @@ #. 50000 #. -#. +#. #. #. @@ -24283,5 +24299,5 @@ #. 50000 #. -#. +#. #. #. @@ -24304,7 +24320,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24314,5 +24330,5 @@ #. 50000 #. -#. +#. #. #. @@ -24321,5 +24337,5 @@ #. 50000 #. -#. +#. #. #. @@ -24329,5 +24345,5 @@ #. 50000 #. -#. +#. #. #. @@ -24336,5 +24352,5 @@ #. 50000 #. -#. +#. #. #. @@ -24344,5 +24360,5 @@ #. 50000 #. -#. +#. #. #. @@ -24352,5 +24368,5 @@ #. 50000 #. -#. +#. #. #. @@ -24366,5 +24382,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24375,5 +24391,5 @@ #. 50000 #. -#. +#. #. #. @@ -24392,5 +24408,5 @@ #. 50000 #. -#. +#. #. #. @@ -24400,5 +24416,5 @@ #. 50000 #. -#. +#. #. #. @@ -24411,5 +24427,5 @@ #. 50000 #. -#. +#. #. #. @@ -24427,5 +24443,5 @@ #. 50000 #. -#. +#. #. #. @@ -24434,5 +24450,5 @@ #. 50000 #. -#. +#. #. #. @@ -24441,5 +24457,5 @@ #. 50000 #. -#. +#. #. #. @@ -24448,7 +24464,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24459,5 +24475,5 @@ #. 50000 #. -#. +#. #. #. @@ -24472,5 +24488,5 @@ #. 50000 #. -#. +#. #. #. @@ -24484,5 +24500,5 @@ #. 50000 #. -#. +#. #. #. @@ -24492,5 +24508,5 @@ #. 50000 #. -#. +#. #. #. @@ -24504,5 +24520,5 @@ #. 50000 #. -#. +#. #. #. @@ -24516,5 +24532,5 @@ #. 50000 #. -#. +#. #. #. @@ -24523,7 +24539,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24533,5 +24549,5 @@ #. 50000 #. -#. +#. #. #. @@ -24541,5 +24557,5 @@ #. 50000 #. -#. +#. #. #. @@ -24549,5 +24565,5 @@ #. 50000 #. -#. +#. #. #. @@ -24557,5 +24573,5 @@ #. 50000 #. -#. +#. #. #. @@ -24571,7 +24587,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24586,5 +24602,5 @@ #. 30000 #. -#. +#. #. #. @@ -24599,5 +24615,5 @@ #. 30000 #. -#. +#. #. #. @@ -24612,5 +24628,5 @@ #. 30000 #. -#. +#. #. #. @@ -24625,5 +24641,5 @@ #. 30000 #. -#. +#. #. #. @@ -24638,5 +24654,5 @@ #. 30000 #. -#. +#. #. #. @@ -24651,7 +24667,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24661,5 +24677,5 @@ #. 50000 #. -#. +#. #. #. @@ -24668,5 +24684,5 @@ #. 50000 #. -#. +#. #. #. @@ -24676,5 +24692,5 @@ #. 50000 #. -#. +#. #. #. @@ -24684,5 +24700,5 @@ #. 50000 #. -#. +#. #. #. @@ -24692,5 +24708,5 @@ #. 50000 #. -#. +#. #. #. @@ -24700,5 +24716,5 @@ #. 50000 #. -#. +#. #. #. @@ -24708,5 +24724,5 @@ #. 50000 #. -#. +#. #. #. @@ -24716,5 +24732,5 @@ #. 50000 #. -#. +#. #. #. @@ -24724,5 +24740,5 @@ #. 50000 #. -#. +#. #. #. @@ -24732,5 +24748,5 @@ #. 50000 #. -#. +#. #. #. @@ -24740,5 +24756,5 @@ #. 50000 #. -#. +#. #. #. @@ -24748,5 +24764,5 @@ #. 50000 #. -#. +#. #. #. @@ -24756,5 +24772,5 @@ #. 50000 #. -#. +#. #. #. @@ -24774,5 +24790,5 @@ #. 50000 #. -#. +#. #. #. @@ -24787,5 +24803,5 @@ #. 50000 #. -#. +#. #. #. @@ -24798,7 +24814,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24808,5 +24824,5 @@ #. 50000 #. -#. +#. #. #. @@ -24816,5 +24832,5 @@ #. 50000 #. -#. +#. #. #. @@ -24824,5 +24840,5 @@ #. 50000 #. -#. +#. #. #. @@ -24832,5 +24848,5 @@ #. 50000 #. -#. +#. #. #. @@ -24840,5 +24856,5 @@ #. 50000 #. -#. +#. #. #. @@ -24848,5 +24864,5 @@ #. 50000 #. -#. +#. #. #. @@ -24856,5 +24872,5 @@ #. 50000 #. -#. +#. #. #. @@ -24864,5 +24880,5 @@ #. 50000 #. -#. +#. #. #. @@ -24872,5 +24888,5 @@ #. 50000 #. -#. +#. #. #. @@ -24880,5 +24896,5 @@ #. 50000 #. -#. +#. #. #. @@ -24888,5 +24904,5 @@ #. 50000 #. -#. +#. #. #. @@ -24896,5 +24912,5 @@ #. 50000 #. -#. +#. #. #. @@ -24904,5 +24920,5 @@ #. 50000 #. -#. +#. #. #. @@ -24912,5 +24928,5 @@ #. 50000 #. -#. +#. #. #. @@ -24931,5 +24947,5 @@ #. 50000 #. -#. +#. #. #. @@ -24943,7 +24959,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24953,5 +24969,5 @@ #. 50000 #. -#. +#. #. #. @@ -24961,5 +24977,5 @@ #. 50000 #. -#. +#. #. #. @@ -24969,5 +24985,5 @@ #. 50000 #. -#. +#. #. #. @@ -24977,5 +24993,5 @@ #. 50000 #. -#. +#. #. #. @@ -24985,5 +25001,5 @@ #. 50000 #. -#. +#. #. #. @@ -24993,5 +25009,5 @@ #. 50000 #. -#. +#. #. #. @@ -25001,5 +25017,5 @@ #. 50000 #. -#. +#. #. #. @@ -25016,5 +25032,5 @@ #. 50000 #. -#. +#. #. #. @@ -25024,5 +25040,5 @@ #. 50000 #. -#. +#. #. #. @@ -25032,5 +25048,5 @@ #. 50000 #. -#. +#. #. #. @@ -25040,5 +25056,5 @@ #. 50000 #. -#. +#. #. #. @@ -25048,5 +25064,5 @@ #. 50000 #. -#. +#. #. #. @@ -25056,5 +25072,5 @@ #. 50000 #. -#. +#. #. #. @@ -25064,5 +25080,5 @@ #. 50000 #. -#. +#. #. #. @@ -25072,5 +25088,5 @@ #. 50000 #. -#. +#. #. #. @@ -25080,5 +25096,5 @@ #. 50000 #. -#. +#. #. #. @@ -25088,5 +25104,5 @@ #. 50000 #. -#. +#. #. #. @@ -25096,5 +25112,5 @@ #. 50000 #. -#. +#. #. #. @@ -25104,5 +25120,5 @@ #. 50000 #. -#. +#. #. #. @@ -25121,5 +25137,5 @@ #. 50000 #. -#. +#. #. #. @@ -25129,5 +25145,5 @@ #. 50000 #. -#. +#. #. #. @@ -25136,5 +25152,5 @@ #. 50000 #. -#. +#. #. #. @@ -25144,5 +25160,5 @@ #. 50000 #. -#. +#. #. #. @@ -25152,5 +25168,5 @@ #. 50000 #. -#. +#. #. #. @@ -25160,5 +25176,5 @@ #. 50000 #. -#. +#. #. #. @@ -25167,5 +25183,5 @@ #. 50000 #. -#. +#. #. #. @@ -25175,5 +25191,5 @@ #. 50000 #. -#. +#. #. #. @@ -25183,5 +25199,5 @@ #. 50000 #. -#. +#. #. #. @@ -25191,5 +25207,5 @@ #. 50000 #. -#. +#. #. #. @@ -25199,5 +25215,5 @@ #. 50000 #. -#. +#. #. #. @@ -25206,5 +25222,5 @@ #. 50000 #. -#. +#. #. #. @@ -25213,5 +25229,5 @@ #. 50000 #. -#. +#. #. #. @@ -25220,5 +25236,5 @@ #. 50000 #. -#. +#. #. #. @@ -25227,5 +25243,5 @@ #. 50000 #. -#. +#. #. #. @@ -25234,5 +25250,5 @@ #. 50000 #. -#. +#. #. #. @@ -25241,5 +25257,5 @@ #. 50000 #. -#. +#. #. #. @@ -25248,5 +25264,5 @@ #. 50000 #. -#. +#. #. #. @@ -25255,5 +25271,5 @@ #. 50000 #. -#. +#. #. #. @@ -25262,5 +25278,5 @@ #. 50000 #. -#. +#. #. #. @@ -25269,5 +25285,5 @@ #. 50000 #. -#. +#. #. #. @@ -25276,5 +25292,5 @@ #. 50000 #. -#. +#. #. #. @@ -25283,5 +25299,5 @@ #. 50000 #. -#. +#. #. #. @@ -25290,5 +25306,5 @@ #. 50000 #. -#. +#. #. #. @@ -25298,5 +25314,5 @@ #. 50000 #. -#. +#. #. #. @@ -25306,5 +25322,5 @@ #. 50000 #. -#. +#. #. #. @@ -25314,5 +25330,5 @@ #. 50000 #. -#. +#. #. #. @@ -25322,5 +25338,5 @@ #. 50000 #. -#. +#. #. #. @@ -25330,5 +25346,5 @@ #. 50000 #. -#. +#. #. #. @@ -25338,5 +25354,5 @@ #. 50000 #. -#. +#. #. #. @@ -25346,5 +25362,5 @@ #. 50000 #. -#. +#. #. #. @@ -25354,5 +25370,5 @@ #. 50000 #. -#. +#. #. #. @@ -25362,5 +25378,5 @@ #. 50000 #. -#. +#. #. #. @@ -25371,5 +25387,5 @@ #. 50000 #. -#. +#. #. #. @@ -25379,5 +25395,5 @@ #. 50000 #. -#. +#. #. #. @@ -25387,5 +25403,5 @@ #. 50000 #. -#. +#. #. #. @@ -25395,5 +25411,5 @@ #. 50000 #. -#. +#. #. #. @@ -25403,5 +25419,5 @@ #. 50000 #. -#. +#. #. #. @@ -25411,5 +25427,5 @@ #. 50000 #. -#. +#. #. #. @@ -25419,5 +25435,5 @@ #. 50000 #. -#. +#. #. #. @@ -25427,5 +25443,5 @@ #. 50000 #. -#. +#. #. #. @@ -25435,5 +25451,5 @@ #. 50000 #. -#. +#. #. #. @@ -25443,5 +25459,5 @@ #. 50000 #. -#. +#. #. #. @@ -25451,5 +25467,5 @@ #. 50000 #. -#. +#. #. #. @@ -25459,5 +25475,5 @@ #. 50000 #. -#. +#. #. #. @@ -25467,5 +25483,5 @@ #. 50000 #. -#. +#. #. #. @@ -25475,5 +25491,5 @@ #. 50000 #. -#. +#. #. #. @@ -25483,5 +25499,5 @@ #. 50000 #. -#. +#. #. #. @@ -25491,5 +25507,5 @@ #. 50000 #. -#. +#. #. #. @@ -25499,5 +25515,5 @@ #. 50000 #. -#. +#. #. #. @@ -25507,5 +25523,5 @@ #. 50000 #. -#. +#. #. #. @@ -25515,5 +25531,5 @@ #. 50000 #. -#. +#. #. #. @@ -25522,5 +25538,5 @@ #. 50000 #. -#. +#. #. #. @@ -25552,5 +25568,5 @@ #. 50000 #. -#. +#. #. #. @@ -25560,5 +25576,5 @@ #. 50000 #. -#. +#. #. #. @@ -25568,7 +25584,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25583,5 +25599,5 @@ #. 50000 #. -#. +#. #. #. @@ -25591,5 +25607,5 @@ #. 50000 #. -#. +#. #. #. @@ -25599,5 +25615,5 @@ #. 50000 #. -#. +#. #. #. @@ -25607,5 +25623,5 @@ #. 50000 #. -#. +#. #. #. @@ -25615,5 +25631,5 @@ #. 50000 #. -#. +#. #. #. @@ -25623,5 +25639,5 @@ #. 50000 #. -#. +#. #. #. @@ -25631,5 +25647,5 @@ #. 50000 #. -#. +#. #. #. @@ -25645,7 +25661,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25655,5 +25671,5 @@ #. 50000 #. -#. +#. #. #. @@ -25663,5 +25679,5 @@ #. 50000 #. -#. +#. #. #. @@ -25671,5 +25687,5 @@ #. 50000 #. -#. +#. #. #. @@ -25679,5 +25695,5 @@ #. 50000 #. -#. +#. #. #. @@ -25687,5 +25703,5 @@ #. 50000 #. -#. +#. #. #. @@ -25695,5 +25711,5 @@ #. 50000 #. -#. +#. #. #. @@ -25703,5 +25719,5 @@ #. 50000 #. -#. +#. #. #. @@ -25711,5 +25727,5 @@ #. 50000 #. -#. +#. #. #. @@ -25719,5 +25735,5 @@ #. 50000 #. -#. +#. #. #. @@ -25727,5 +25743,5 @@ #. 50000 #. -#. +#. #. #. @@ -25735,5 +25751,5 @@ #. 50000 #. -#. +#. #. #. @@ -25743,5 +25759,5 @@ #. 50000 #. -#. +#. #. #. @@ -25751,5 +25767,5 @@ #. 50000 #. -#. +#. #. #. @@ -25759,5 +25775,5 @@ #. 50000 #. -#. +#. #. #. @@ -25767,5 +25783,5 @@ #. 50000 #. -#. +#. #. #. @@ -25775,5 +25791,5 @@ #. 50000 #. -#. +#. #. #. @@ -25783,5 +25799,5 @@ #. 50000 #. -#. +#. #. #. @@ -25791,5 +25807,5 @@ #. 50000 #. -#. +#. #. #. @@ -25799,5 +25815,5 @@ #. 50000 #. -#. +#. #. #. @@ -25807,5 +25823,5 @@ #. 50000 #. -#. +#. #. #. @@ -25815,5 +25831,5 @@ #. 50000 #. -#. +#. #. #. @@ -25823,5 +25839,5 @@ #. 50000 #. -#. +#. #. #. @@ -25831,5 +25847,5 @@ #. 50000 #. -#. +#. #. #. @@ -25839,5 +25855,5 @@ #. 50000 #. -#. +#. #. #. @@ -25847,5 +25863,5 @@ #. 50000 #. -#. +#. #. #. @@ -25855,5 +25871,5 @@ #. 50000 #. -#. +#. #. #. @@ -25863,5 +25879,5 @@ #. 50000 #. -#. +#. #. #. @@ -25871,5 +25887,5 @@ #. 50000 #. -#. +#. #. #. @@ -25879,5 +25895,5 @@ #. 50000 #. -#. +#. #. #. @@ -25887,5 +25903,5 @@ #. 50000 #. -#. +#. #. #. @@ -25895,5 +25911,5 @@ #. 50000 #. -#. +#. #. #. @@ -25903,5 +25919,5 @@ #. 50000 #. -#. +#. #. #. @@ -25911,5 +25927,5 @@ #. 50000 #. -#. +#. #. #. @@ -25919,5 +25935,5 @@ #. 50000 #. -#. +#. #. #. @@ -25927,5 +25943,5 @@ #. 50000 #. -#. +#. #. #. @@ -25935,5 +25951,5 @@ #. 50000 #. -#. +#. #. #. @@ -25943,5 +25959,5 @@ #. 50000 #. -#. +#. #. #. @@ -25951,5 +25967,5 @@ #. 50000 #. -#. +#. #. #. @@ -25959,5 +25975,5 @@ #. 50000 #. -#. +#. #. #. @@ -25967,5 +25983,5 @@ #. 50000 #. -#. +#. #. #. @@ -25975,5 +25991,5 @@ #. 50000 #. -#. +#. #. #. @@ -25983,5 +25999,5 @@ #. 50000 #. -#. +#. #. #. @@ -26017,7 +26033,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26027,5 +26043,5 @@ #. 50000 #. -#. +#. #. #. @@ -26035,5 +26051,5 @@ #. 50000 #. -#. +#. #. #. @@ -26043,5 +26059,5 @@ #. 50000 #. -#. +#. #. #. @@ -26051,5 +26067,5 @@ #. 50000 #. -#. +#. #. #. @@ -26059,5 +26075,5 @@ #. 50000 #. -#. +#. #. #. @@ -26067,5 +26083,5 @@ #. 50000 #. -#. +#. #. #. @@ -26075,5 +26091,5 @@ #. 50000 #. -#. +#. #. #. @@ -26090,5 +26106,5 @@ #. 50000 #. -#. +#. #. #. @@ -26098,5 +26114,5 @@ #. 50000 #. -#. +#. #. #. @@ -26106,5 +26122,5 @@ #. 50000 #. -#. +#. #. #. @@ -26114,5 +26130,5 @@ #. 50000 #. -#. +#. #. #. @@ -26122,5 +26138,5 @@ #. 50000 #. -#. +#. #. #. @@ -26130,5 +26146,5 @@ #. 50000 #. -#. +#. #. #. @@ -26139,5 +26155,5 @@ #. 50000 #. -#. +#. #. #. @@ -26147,5 +26163,5 @@ #. 50000 #. -#. +#. #. #. @@ -26155,5 +26171,5 @@ #. 40000 #. -#. +#. #. #. @@ -26163,5 +26179,5 @@ #. 50000 #. -#. +#. #. #. @@ -26170,5 +26186,5 @@ #. 40000 #. -#. +#. #. #. @@ -26177,5 +26193,5 @@ #. 40000 #. -#. +#. #. #. @@ -26193,7 +26209,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26203,5 +26219,5 @@ #. 50000 #. -#. +#. #. #. @@ -26211,5 +26227,5 @@ #. 50000 #. -#. +#. #. #. @@ -26219,5 +26235,5 @@ #. 50000 #. -#. +#. #. #. @@ -26227,5 +26243,5 @@ #. 50000 #. -#. +#. #. #. @@ -26235,5 +26251,5 @@ #. 50000 #. -#. +#. #. #. @@ -26243,5 +26259,5 @@ #. 50000 #. -#. +#. #. #. @@ -26251,5 +26267,5 @@ #. 50000 #. -#. +#. #. #. @@ -26259,5 +26275,5 @@ #. 50000 #. -#. +#. #. #. @@ -26267,5 +26283,5 @@ #. 50000 #. -#. +#. #. #. @@ -26284,5 +26300,5 @@ #. 50000 #. -#. +#. #. #. @@ -26296,5 +26312,5 @@ #. 50000 #. -#. +#. #. #. @@ -26308,5 +26324,5 @@ #. 50000 #. -#. +#. #. #. @@ -26316,5 +26332,5 @@ #. 50000 #. -#. +#. #. #. @@ -26328,5 +26344,5 @@ #. 50000 #. -#. +#. #. #. @@ -26340,5 +26356,5 @@ #. 50000 #. -#. +#. #. #. @@ -26352,6 +26368,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26361,5 +26377,5 @@ #. 50000 #. -#. +#. #. #. @@ -26373,5 +26389,5 @@ #. 50000 #. -#. +#. #. #. @@ -26385,5 +26401,5 @@ #. 50000 #. -#. +#. #. #. @@ -26397,5 +26413,5 @@ #. 50000 #. -#. +#. #. #. @@ -26409,5 +26425,5 @@ #. 50000 #. -#. +#. #. #. @@ -26421,5 +26437,5 @@ #. 50000 #. -#. +#. #. #. @@ -26429,7 +26445,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26439,5 +26455,5 @@ #. 50000 #. -#. +#. #. #. @@ -26447,5 +26463,5 @@ #. 50000 #. -#. +#. #. #. @@ -26455,5 +26471,5 @@ #. 50000 #. -#. +#. #. #. @@ -26463,5 +26479,5 @@ #. 50000 #. -#. +#. #. #. @@ -26478,5 +26494,5 @@ #. 50000 #. -#. +#. #. #. @@ -26489,5 +26505,5 @@ #. 50000 #. -#. +#. #. #. @@ -26501,5 +26517,5 @@ #. 50000 #. -#. +#. #. #. @@ -26513,5 +26529,5 @@ #. 50000 #. -#. +#. #. #. @@ -26525,5 +26541,5 @@ #. 50000 #. -#. +#. #. #. @@ -26534,5 +26550,5 @@ #. 50000 #. -#. +#. #. #. @@ -26542,5 +26558,5 @@ #. 50000 #. -#. +#. #. #. @@ -26550,5 +26566,5 @@ #. 50000 #. -#. +#. #. #. @@ -26558,5 +26574,5 @@ #. 50000 #. -#. +#. #. #. @@ -26566,5 +26582,5 @@ #. 50000 #. -#. +#. #. #. @@ -26581,5 +26597,5 @@ #. 50000 #. -#. +#. #. #. @@ -26593,5 +26609,5 @@ #. 50000 #. -#. +#. #. #. @@ -26605,5 +26621,5 @@ #. 50000 #. -#. +#. #. #. @@ -26617,5 +26633,5 @@ #. 50000 #. -#. +#. #. #. @@ -26629,5 +26645,5 @@ #. 50000 #. -#. +#. #. #. @@ -26641,5 +26657,5 @@ #. 50000 #. -#. +#. #. #. @@ -26648,7 +26664,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26658,5 +26674,5 @@ #. 50000 #. -#. +#. #. #. @@ -26666,5 +26682,5 @@ #. 50000 #. -#. +#. #. #. @@ -26674,5 +26690,5 @@ #. 50000 #. -#. +#. #. #. @@ -26682,5 +26698,5 @@ #. 50000 #. -#. +#. #. #. @@ -26690,5 +26706,5 @@ #. 50000 #. -#. +#. #. #. @@ -26698,5 +26714,5 @@ #. 50000 #. -#. +#. #. #. @@ -26706,5 +26722,5 @@ #. 50000 #. -#. +#. #. #. @@ -26721,7 +26737,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26731,5 +26747,5 @@ #. 50000 #. -#. +#. #. #. @@ -26739,5 +26755,5 @@ #. 50000 #. -#. +#. #. #. @@ -26747,5 +26763,5 @@ #. 50000 #. -#. +#. #. #. @@ -26755,5 +26771,5 @@ #. 50000 #. -#. +#. #. #. @@ -26769,5 +26785,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26816,5 +26832,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26824,5 +26840,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26832,5 +26848,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26840,5 +26856,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26848,5 +26864,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26856,5 +26872,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26864,5 +26880,5 @@ #. 50000 #. -#. +#. #. #. @@ -26872,5 +26888,5 @@ #. 50000 #. -#. +#. #. #. @@ -26880,5 +26896,5 @@ #. 50000 #. -#. +#. #. #. @@ -26888,5 +26904,5 @@ #. 50000 #. -#. +#. #. #. @@ -26896,5 +26912,5 @@ #. 50000 #. -#. +#. #. #. @@ -26904,5 +26920,5 @@ #. 50000 #. -#. +#. #. #. @@ -26922,5 +26938,5 @@ #. 50000 #. -#. +#. #. #. @@ -26929,5 +26945,5 @@ #. 50000 #. -#. +#. #. #. @@ -26936,5 +26952,5 @@ #. 50000 #. -#. +#. #. #. @@ -26943,5 +26959,5 @@ #. 40000 #. -#. +#. #. #. @@ -26950,5 +26966,5 @@ #. 40000 #. -#. +#. #. #. @@ -26957,5 +26973,5 @@ #. 40000 #. -#. +#. #. #. @@ -27050,5 +27066,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -27056,28 +27072,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 @@ -27192,5 +27208,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27203,5 +27219,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27226,6 +27242,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27234,6 +27250,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27248,6 +27264,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 @@ -27261,6 +27277,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 @@ -27280,6 +27296,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27303,6 +27319,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 @@ -27315,4 +27331,68 @@ msgstr "" +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Não é possível desfazer comando \"{0}\" porque a camada \"{1}\" não está " +#~ "mais presente" + +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Habilitar para envio de todas modificações em uma chamada, desabilitar " +#~ "para usar uma chamada por primitiva" + +#~ msgid "Images for {0}" +#~ msgstr "Imagens para {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Ler GPX..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Sem tempo para ponto {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Não foi possível ler tempo \"{0}\" para ponto {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Não foram encontradas imagens com dados de tempo legíveis" + +#~ msgid "GPS start: {0}" +#~ msgstr "Iniciar GPS: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "Finalizar GPS: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "delta atual: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "diferença de zona horária: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} dentro da faixa" + +#~ msgid "Sync clock" +#~ msgstr "Sincronizar relógio" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "A data no arquivo \"{0}\" não pode ser analisada." + +#~ msgid "Image" +#~ msgstr "Imagem" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Digite data de exibição (mm/dd/aaaa HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Zona horária do GPS (diferença com foto)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Sincronizar Tempo com Unidade GPS" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "O tempo informado não pode ser analisado." + #~ msgid "Unknown version" #~ msgstr "Versão desconhecida" @@ -27333,5 +27413,4 @@ #~ msgstr "Encontrado elemento em non-relation." -#, java-format #~ msgid "" #~ "Warning - loading of {0} plugin was requested. This plugin is no longer " @@ -27354,5 +27433,4 @@ #~ msgstr " tem ref zero" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Por favor, reporte um erro em {0}" @@ -27369,9 +27447,9 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" -#~ "Tente atualizar para a última versão do JOSM e plugins antes de reportar um " -#~ "bug." +#~ "Tente atualizar para a última versão do JOSM e plugins antes de reportar " +#~ "um bug." #~ msgid "Be sure to include the following information:" @@ -27381,5 +27459,4 @@ #~ msgstr "Membro vazio na relação." -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Pulando uma via porque ela inclui um nó que não existe: {0}\n" @@ -27389,9 +27466,7 @@ #~ "Dica: Algumas alterações vieram ao enviar novos dados para o servidor." -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Não foi possível abrir o diretório de preferências: {0}" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27438,15 +27513,10 @@ #~ msgstr "nome" -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Por favor, entre com as coordenadas desejadas primeiro." - #~ msgid "Select a bookmark first." #~ msgstr "Selecione um favorito primeiro" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Usar preferência ''{0}'' do grupo ''{1}''" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Usar preferencia ''{0}''" @@ -27491,9 +27561,7 @@ #~ msgstr "Existiram conflitos durante a importação" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Editor de relações: {0}" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Autores: {0}" @@ -27505,5 +27573,4 @@ #~ msgstr "Unir camada diretamente inferior com camada selecionada." -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Conflitos: {0}" @@ -27536,5 +27603,4 @@ #~ msgstr "Pode-se editar somente páginas de ajuda online do JOSM" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Erro ao carregar página {0}" @@ -27544,9 +27610,9 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "Os nós selecionados tem relações de usuários diferentes. Você ainda pretende " -#~ "uni-los?" +#~ "Os nós selecionados tem relações de usuários diferentes. Você ainda " +#~ "pretende uni-los?" #~ msgid "Merge nodes with different memberships?" @@ -27571,5 +27637,4 @@ #~ msgstr "Somente um nó selecionado" -#, java-format #~ msgid "Could not rename the file \"{0}\"." #~ msgstr "Não foi possível renomear o arquivo \"{0}\"." @@ -27588,8 +27653,9 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" -#~ "Não foram encontrados dados a atualizar. Você já abriu ou baixou uma camada " -#~ "de dados?" +#~ "Não foram encontrados dados a atualizar. Você já abriu ou baixou uma " +#~ "camada de dados?" #~ msgid "No data imported." @@ -27618,6 +27684,6 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" #~ "Erro interno: Não é possível verificar condições sem nenhuma camada. Por " @@ -27645,5 +27711,4 @@ #~ msgstr "Envio para API OSM falhou" -#, java-format #~ msgid "" #~ "Uploading failed because a primitive you tried " @@ -27652,12 +27717,10 @@ #~ msgstr "" #~ "Envio falhou porque uma primitiva que você " -#~ "tentou
apagar no servidor já está apagada.

A mensagem de erro " -#~ "é:
{0}" - -#, java-format +#~ "tentou
apagar no servidor já está apagada.

A mensagem de erro é:" +#~ "
{0}" + #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" #~ msgstr "Cabeçalho de erro \"{0}\" não se encaixa no padrão \"{1}\"" -#, java-format #~ msgid "" #~ "WARNING: launching browser windows for the first {0} of {1} selected " @@ -27668,6 +27731,6 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" #~ "Os caminhos selecionados têm filiações diferentes. Você pretende uni-los " @@ -27715,16 +27778,11 @@ #~ "projection to get rid of this warning.
Do you want to continue?" #~ msgstr "" -#~ "Você está usando a projeção EPSG:4326 que pode levar a
resultados " -#~ "indesejados quando fizer alinhamentos retangulares.
Mude sua projeção " -#~ "para evitar esta notificação.
Pretende continuar?" - -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Apagar {1} {0}" +#~ "Você está usando a projeção EPSG:4326 que pode levar " +#~ "a
resultados indesejados quando fizer alinhamentos retangulares." +#~ "
Mude sua projeção para evitar esta notificação.
Pretende continuar?" #~ msgid "Purging 1 primitive" #~ msgstr "Purgando 1 primitiva" -#, java-format #~ msgid "removing reference from way {0}" #~ msgstr "removendo referência de caminho {0}" @@ -27748,5 +27806,4 @@ #~ msgstr "Não foi possível ler os Favoritos." -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27766,6 +27823,6 @@ #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" #~ msgstr "" -#~ "Não foi possível encontrar primitiva com id {0} e versão {1} no conjunto de " -#~ "dados" +#~ "Não foi possível encontrar primitiva com id {0} e versão {1} no conjunto " +#~ "de dados" #~ msgid "Error while parsing" @@ -27793,5 +27850,4 @@ #~ msgstr "Continuar assim mesmo" -#, java-format #~ msgid "Remove relation member {0} {1}" #~ msgstr "Apagar membro de relação {0}{1}" @@ -27824,14 +27880,14 @@ #~ msgstr "quadro" -#, java-format #~ msgid "" -#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" #~ msgstr "" -#~ "Levantada exceção de segurança setAlwaysOnTop(). Ignorando. Exceção foi: {0}" +#~ "Levantada exceção de segurança setAlwaysOnTop(). Ignorando. Exceção foi: " +#~ "{0}" #~ msgid "Linked" #~ msgstr "Vinculado" -#, java-format #~ msgid "" #~ "Failed to access system property ''{0}'' for security reasons. Exception " @@ -27850,20 +27906,18 @@ #~ msgstr "Baixando referencias..." -#, java-format #~ msgid "Help page missing. Create it in English." -#~ msgstr "Faltando página de Ajuda. Crie uma em português." - -#, java-format +#~ msgstr "" +#~ "Faltando página de Ajuda. Crie uma em português." + #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" -#~ "Página de ajuda. Crie-a em English ou português." +#~ "Página de ajuda. Crie-a em English ou português." #~ msgid "Didn't find an primitive with id {0} in this dataset" #~ msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset." -#, java-format #~ msgid "Unexpected return value. Got {0}." #~ msgstr "valor não esperado de retorno. Veio {0}" @@ -27881,5 +27935,4 @@ #~ msgstr "não foi encontrada a última versão. Histórico está vazio." -#, java-format #~ msgid "Index out of bounds. Got {0}." #~ msgstr "índice fora dos limites. Obtido {0}" @@ -27891,19 +27944,17 @@ #~ msgstr "Não pode procurar porque não exite informação carregada." -#, java-format #~ msgid "" #~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " #~ "relation?" #~ msgstr "" -#~ "Selecção \"{0}\" é usada pela relação \"{1}\".
Apagar da " -#~ "relação?" - -#, java-format +#~ "Selecção \"{0}\" é usada pela relação \"{1}\".
Apagar da relação?" +#~ "" + #~ msgid "" -#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " -#~ "from relation?" +#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." +#~ "
Delete from relation?" #~ msgstr "" -#~ "A selecção \"{0}\" é usada pela relação \"{1}\" com o papel " -#~ "{2}.
Apagar da relação?" +#~ "A selecção \"{0}\" é usada pela relação \"{1}\" com o papel {2}." +#~ "
Apagar da relação?" #~ msgid "Replace" Index: /applications/editors/josm/i18n/po/ro.po =================================================================== --- /applications/editors/josm/i18n/po/ro.po (revision 18974) +++ /applications/editors/josm/i18n/po/ro.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:16+0000\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-11-29 22:15+0000\n" "Last-Translator: Cezar Radu-Buterez \n" "Language-Team: Romanian \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\n" -"X-Launchpad-Export-Date: 2009-11-29 21:05+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -33,6 +33,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 @@ -49,7 +49,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 @@ -65,19 +65,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 @@ -90,9 +89,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" @@ -120,5 +119,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 @@ -141,9 +140,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 @@ -159,20 +158,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 @@ -191,7 +186,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 "Eroare" @@ -271,5 +266,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 "Extensii" @@ -310,4 +305,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 @@ -315,8 +312,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 @@ -326,29 +323,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 @@ -379,6 +374,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 "" @@ -430,14 +425,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 "Latitudine" #: ../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 "Longitudine" @@ -463,10 +458,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 @@ -497,19 +492,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 @@ -518,9 +516,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 @@ -536,7 +531,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 @@ -548,11 +543,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" @@ -640,5 +635,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}" @@ -691,10 +686,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 "Combină {0} căi" -#: ../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 "Selectează te rog cel puţin două căi pentru a le combina." @@ -713,19 +708,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 "Creează Cerc" -#: ../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 "Creează un cerc din trei noduri selectate." -#: ../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 " @@ -738,9 +733,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 @@ -812,21 +807,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" @@ -834,6 +833,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 @@ -862,5 +861,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 "Duplicare" @@ -917,8 +916,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 @@ -926,5 +923,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 @@ -937,8 +934,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 @@ -957,8 +954,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 @@ -981,13 +978,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 @@ -1027,4 +1025,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 "Introdu valori pentru toate conflictele." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Rezolvă Conflictele" + +#: ../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 @@ -1044,4 +1138,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" @@ -1052,26 +1187,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 "" @@ -1079,5 +1214,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" @@ -1450,6 +1585,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 "" @@ -1469,9 +1603,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 @@ -1594,6 +1760,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 "" @@ -1669,54 +1834,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 "" @@ -1725,35 +1890,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 "Nu sunt schimbări de transmis." -#: ../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 "Nimic de transmis. Mai întâi obţineţi nişte date." -#: ../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 "" @@ -1761,28 +1926,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 "" @@ -1792,22 +1955,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 "" @@ -1818,15 +1981,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 "" @@ -1838,6 +2001,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 "" @@ -1846,38 +2009,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 "" @@ -2041,6 +2203,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 "" @@ -2107,38 +2269,38 @@ msgstr "selectat" -#: ../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 "Adaugă nod" -#: ../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 "Adaugă nod nou la o cale existentă" -#: ../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 "Creează nod nou" -#: ../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." @@ -2147,14 +2309,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 "" @@ -2189,6 +2351,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 "" @@ -2283,5 +2445,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." @@ -2364,12 +2526,16 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +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-" @@ -2377,43 +2543,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 @@ -2423,55 +2589,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 "Căutare" -#: ../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 "" -#: ../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 "" -#: ../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 "" @@ -2481,40 +2647,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 "" @@ -2523,9 +2689,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 "" @@ -2534,5 +2700,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." @@ -2583,6 +2749,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 "" @@ -2590,5 +2755,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 "" @@ -2725,5 +2890,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 "" @@ -2742,5 +2907,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 "" @@ -2759,19 +2925,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" @@ -2780,5 +2946,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" @@ -2787,5 +2953,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" @@ -2795,5 +2961,5 @@ msgstr[2] "Șterge {0} căi" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2804,13 +2970,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 "" @@ -2828,15 +2994,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 "" @@ -2845,5 +3011,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}" @@ -2853,9 +3019,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 "" @@ -2935,5 +3096,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 " @@ -3076,6 +3237,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 "" @@ -3158,5 +3319,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3165,5 +3326,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3171,25 +3332,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 @@ -3212,25 +3373,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}" @@ -3238,6 +3400,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 "" @@ -3300,24 +3462,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 " @@ -3325,5 +3487,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 "" @@ -3355,6 +3517,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}." @@ -3375,5 +3537,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 @@ -3385,6 +3546,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 "" @@ -3395,135 +3555,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 "" +#: ../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 "" + +#: ../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 "" + +#: ../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:557 +msgid "More than one \"to\" way found." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:922 -#, java-format -msgid "Deleted member ''{0}'' in relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:930 -#, java-format -msgid "Way ''{0}'' with less than two points." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -msgid "More than one \"from\" way found." +#: ../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:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#, java-format +msgid "Unknown role ''{0}''." msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 -msgid "More than one \"to\" way found." +#, java-format +msgid "Unknown member type for ''{0}''." msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -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 -#, java-format -msgid "Unknown role ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 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:832 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "" + +#: ../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:891 #, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:903 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950 -#, 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 "" -#: ../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}" @@ -3535,5 +3695,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 @@ -3554,5 +3714,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 @@ -3572,5 +3732,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 "fundal" @@ -3688,6 +3848,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 "" @@ -3702,5 +3861,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 @@ -3708,32 +3867,32 @@ msgstr "" -#: ../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 "incomplet" -#: ../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" @@ -3742,5 +3901,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -3984,12 +4143,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 @@ -4003,19 +4162,19 @@ msgstr "Editare" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Vizualizare" -#: ../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 "Unelte" -#: ../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 @@ -4026,5 +4185,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "" @@ -4068,29 +4227,29 @@ msgstr "scală" -#: ../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 " @@ -4098,9 +4257,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 "" @@ -4206,5 +4365,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" @@ -4213,5 +4372,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" @@ -4220,5 +4379,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" @@ -4237,5 +4396,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 @@ -4252,5 +4411,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" @@ -4322,22 +4481,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." @@ -4416,6 +4575,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 "" @@ -4484,6 +4642,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" @@ -4491,6 +4649,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" @@ -4547,6 +4705,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 "" @@ -4579,7 +4737,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 "" @@ -4725,5 +4883,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 "" @@ -4858,5 +5016,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 "" @@ -4956,7 +5114,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" @@ -4966,6 +5124,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" @@ -4999,7 +5157,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 "" @@ -5088,5 +5244,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 @@ -5155,10 +5311,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 "" @@ -5233,18 +5388,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 "Istoric" -#: ../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 "Afişează istoricul tuturor elementelor selectate." -#: ../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 @@ -5254,13 +5409,13 @@ msgstr "Reîncarcă" -#: ../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 "Reîncarcă toate obiectele selectate curent şi împrospătează lista." -#: ../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 "" @@ -5454,5 +5609,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 "" @@ -5495,30 +5650,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 "" -#: ../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 "Selecţie" -#: ../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 "" -#: ../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 "" @@ -5578,37 +5733,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 "" @@ -5617,63 +5772,90 @@ 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 +#, 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] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Descarc date" + +#: ../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 +msgid "Apply Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +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 "" @@ -5683,15 +5865,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 " @@ -5699,5 +5881,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 " @@ -5705,20 +5887,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 "" @@ -5727,66 +5909,69 @@ 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 +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 " @@ -5795,53 +5980,58 @@ 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" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +msgid "Download all incomplete members" +msgstr "" + +#: ../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 "" @@ -5851,41 +6041,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 "" @@ -5925,19 +6108,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}''" @@ -5949,6 +6132,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 "" @@ -6126,7 +6308,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 "" @@ -6899,5 +7080,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 @@ -7134,6 +7315,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 "" @@ -7143,6 +7324,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 "" @@ -7405,13 +7586,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}" @@ -7512,6 +7693,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 "" @@ -7596,6 +7776,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] "" @@ -7609,6 +7789,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 " @@ -7663,5 +7843,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 " @@ -7669,5 +7849,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 "" @@ -7740,40 +7920,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 "Obiecte de adăugat:" -#: ../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 "Obiecte de modificat:" -#: ../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 "Obiecte de şters:" -#: ../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:" @@ -7782,5 +7962,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:" @@ -7789,5 +7969,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:" @@ -7796,68 +7976,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 "Vă rog întâi introduceţi coordonatele dorite." + +#: ../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 +#: ../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}" @@ -7865,16 +8044,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}." @@ -7882,6 +8061,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 "" @@ -7890,5 +8069,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 "" @@ -7918,112 +8097,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Imagini pentru {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Nu există timp pentru punctul {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 "Nu pot citi timpul \"{0}\" din punctul {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 "Citesc {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Nu am găsit imagini cu mărci de timp citibile." - -#: ../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 "Imagini geoetichetate" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "Start GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "Sfârşit GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "diferentă curentă: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "diferenţă zonă de timp: " - -#: ../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] "imagine" -msgstr[1] "imagini" -msgstr[2] "de imagini" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} în urmă." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Sincronizare ceas" - -#: ../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 "Imagine JPEG (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "Datele din fişierul \"{0}\" nu au putut fi interpretate." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "Nu există timp EXIF în fişierul \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Imagine" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)" - -#: ../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 "Sincronizare timp cu unitatea GPS" - -#: ../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 "Timpul introdus nu a putut fi interpretat." - -#: ../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 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../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 "Vă rog introduceţi un şir de căutat" + +#: ../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 @@ -8031,30 +8154,30 @@ msgstr "punct 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 "Personalizează trasarea liniilor" -#: ../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 "Utilizează opţiunile globale." -#: ../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 "Trasează linii între puncte pentru acest strat." -#: ../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 "Nu trasa linii între puncte pentru acest strat." -#: ../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 "Selectaţi opţiunile pentru trasarea liniilor" -#: ../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 @@ -8062,5 +8185,5 @@ msgstr "Personalizează culoarea" -#: ../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 @@ -8069,5 +8192,5 @@ msgstr "Implicit" -#: ../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 @@ -8076,58 +8199,63 @@ msgstr "Alegeţi o culoare" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301 msgid "Import images" msgstr "Importă imagini" -#: ../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 "Imagine JPEG (*.jpg)" + +#: ../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 "" -#: ../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 @@ -8135,5 +8263,5 @@ msgstr "" -#: ../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" @@ -8143,5 +8271,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 @@ -8149,22 +8277,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, " @@ -8173,5 +8296,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" @@ -8180,22 +8303,22 @@ 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 "Converteşte la strat de date" -#: ../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 "" -#: ../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 @@ -8205,29 +8328,29 @@ msgstr "" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8236,9 +8359,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 " @@ -8246,5 +8369,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 " @@ -8252,23 +8375,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 "" -#: ../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." @@ -8277,5 +8400,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 "" @@ -8289,5 +8412,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 "" @@ -8300,11 +8423,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" @@ -8313,32 +8436,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} constă în:" -#: ../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 "" @@ -8346,6 +8469,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 "" @@ -8388,4 +8511,344 @@ msgstr[2] "{0} de puncte" +#: ../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 "Eroare la prelucrarea {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Nu am putut citi \"{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 "Citesc {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 "Imagini geoetichetate" + +#: ../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] "imagine" +msgstr[1] "imagini" +msgstr[2] "de imagini" + +#: ../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 "Imagini geoetichetate" + +#: ../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" @@ -8683,5 +9146,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 @@ -8875,6 +9338,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 "" @@ -8933,6 +9395,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 "" @@ -9000,18 +9461,18 @@ #: ../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 "Aspect" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 -msgid "Default (Auto determined)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 msgid "Language" msgstr "Limbă" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:112 +#: ../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 "" @@ -9273,6 +9734,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 "" @@ -9335,6 +9796,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 "" @@ -9347,9 +9808,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 "" @@ -9373,6 +9833,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 "" @@ -9465,5 +9925,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 "" @@ -9551,5 +10011,5 @@ msgstr "Descarc punctele {0} până la {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 @@ -9557,5 +10017,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9673,14 +10133,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 @@ -9708,24 +10167,32 @@ 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] "Descarc punctele {0} până la {1}..." +msgstr[1] "Descarc punctele {0} până la {1}..." +msgstr[2] "Descarc punctele {0} până la {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9767,27 +10234,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 "" @@ -9795,66 +10262,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}." @@ -9889,5 +10356,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}''." @@ -9914,5 +10381,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}." @@ -9920,5 +10387,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}" @@ -9931,5 +10398,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}''." @@ -9989,7 +10456,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 "" @@ -10017,6 +10484,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 "" @@ -10082,46 +10549,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 "" @@ -10129,19 +10595,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 "Obiect ilegal cu 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 "" @@ -10151,8 +10617,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 "" @@ -10162,25 +10628,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 "" @@ -10188,5 +10654,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10195,5 +10661,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10201,5 +10667,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10208,13 +10674,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 "" @@ -10266,4 +10732,10 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 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 "" @@ -10302,42 +10774,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 "" @@ -10376,17 +10849,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:139 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146 +#, java-format +msgid "Delete old plugin {0}" +msgstr "" + +#: ../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}." @@ -10398,19 +10881,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" @@ -10419,50 +10901,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 "Modulul nu a fost găsit: {0}." -#: ../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 " @@ -10470,9 +10952,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 "" @@ -10480,19 +10962,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 " @@ -10500,13 +10982,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" @@ -10615,6 +11097,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 "" @@ -10652,6 +11134,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 "" @@ -10713,7 +11195,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 "" @@ -10725,7 +11206,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 "" @@ -10757,6 +11238,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 "" @@ -11007,5 +11488,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" @@ -11020,12 +11501,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 @@ -11033,440 +11512,139 @@ 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 +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 +msgid "Actual" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "imagine" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +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 +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 "Eroare la prelucrarea {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Nu am putut citi \"{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 "" @@ -11611,11 +11789,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 "" @@ -11922,12 +12099,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 @@ -12039,14 +12208,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 " @@ -12354,4 +12523,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" @@ -12395,18 +12568,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" @@ -12455,7 +12628,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12465,5 +12638,5 @@ #. 50000 #. -#. +#. #. #. @@ -12473,5 +12646,5 @@ #. 50000 #. -#. +#. #. #. @@ -12480,5 +12653,5 @@ #. 50000 #. -#. +#. #. #. @@ -12488,5 +12661,5 @@ #. 50000 #. -#. +#. #. #. @@ -12564,6 +12737,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 "" @@ -12582,7 +12754,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 "" @@ -12644,20 +12815,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 "" @@ -12874,6 +13044,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 "" @@ -12954,9 +13123,10 @@ msgstr "Extensie fişier necunoscută : {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 " @@ -12964,9 +13134,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 "" @@ -13339,17 +13505,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 "" @@ -13392,160 +13558,4 @@ #: ../plugins/terracer/src/terracer/TerracerAction.java:475 msgid "Optional" -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 "Introdu valori pentru toate conflictele." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Rezolvă Conflictele" - -#: ../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 "" @@ -13642,5 +13652,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}" @@ -13693,34 +13703,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 "" @@ -13769,18 +13779,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 "" @@ -14009,7 +14019,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 "" @@ -14152,5 +14161,5 @@ #. 50000 #. -#. +#. #. #. @@ -14158,5 +14167,5 @@ #. #. -#. +#. #. #. @@ -14166,5 +14175,5 @@ #. 50000 #. -#. +#. #. #. @@ -14173,5 +14182,5 @@ #. 50000 #. -#. +#. #. #. @@ -14180,5 +14189,5 @@ #. 50000 #. -#. +#. #. #. @@ -14187,5 +14196,5 @@ #. 50000 #. -#. +#. #. #. @@ -14194,5 +14203,5 @@ #. 50000 #. -#. +#. #. #. @@ -14201,9 +14210,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14248,5 +14257,5 @@ #. 50000 #. -#. +#. #. #. @@ -14379,14 +14388,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 " @@ -14395,14 +14404,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 "" @@ -14411,5 +14420,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 "" @@ -14421,13 +14430,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." @@ -14581,50 +14590,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 "Salvează strat WMS" -#: ../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 "" @@ -14700,5 +14709,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 "" @@ -14736,21 +14745,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 " @@ -14762,21 +14766,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 " @@ -14785,10 +14789,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 " @@ -14797,21 +14801,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 " @@ -14821,16 +14824,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 " @@ -14840,10 +14843,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 " @@ -14852,5 +14855,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 " @@ -14860,27 +14863,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 " @@ -14889,15 +14892,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 +msgid "Let other applications send commands to JOSM." +msgstr "" + +#. Plugin routes #: build/trans_plugins.java:55 -msgid "Let other applications send commands to JOSM." -msgstr "" - -#. Plugin routes -#: build/trans_plugins.java:57 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -14906,10 +14909,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 " @@ -14918,15 +14921,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 " @@ -14936,17 +14939,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 " @@ -14955,5 +14951,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -14962,10 +14958,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, ...)." @@ -16018,8 +16014,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16216,5 +16212,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16224,5 +16220,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16241,5 +16237,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16249,5 +16245,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16266,5 +16262,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16274,5 +16270,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16291,5 +16287,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16299,5 +16295,5 @@ #. 300000 #. -#. +#. #. #. @@ -16312,5 +16308,5 @@ #. 300000 #. -#. +#. #. #. @@ -16328,5 +16324,5 @@ #. 50000 #. -#. +#. #. #. @@ -16344,5 +16340,5 @@ #. 40000 #. -#. +#. #. #. @@ -16351,5 +16347,5 @@ #. 40000 #. -#. +#. #. #. @@ -16359,5 +16355,5 @@ #. 50000 #. -#. +#. #. #. @@ -16377,5 +16373,5 @@ #. 50000 #. -#. +#. #. #. @@ -16384,5 +16380,5 @@ #. 50000 #. -#. +#. #. #. @@ -16392,5 +16388,5 @@ #. 50000 #. -#. +#. #. #. @@ -16440,7 +16436,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17139,5 +17135,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17176,5 +17172,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17270,5 +17266,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17425,5 +17421,5 @@ #. 50000 #. -#. +#. #. #. @@ -18810,5 +18806,5 @@ #. 30000 #. -#. +#. #. #. @@ -18818,5 +18814,5 @@ #. 40000 #. -#. +#. #. #. @@ -18826,5 +18822,5 @@ #. 20000 #. -#. +#. #. #. @@ -18834,5 +18830,5 @@ #. 40000 #. -#. +#. #. #. @@ -19190,7 +19186,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19200,5 +19196,5 @@ #. 50000 #. -#. +#. #. #. @@ -19208,5 +19204,5 @@ #. 50000 #. -#. +#. #. #. @@ -19216,5 +19212,5 @@ #. 50000 #. -#. +#. #. #. @@ -19224,5 +19220,5 @@ #. 50000 #. -#. +#. #. #. @@ -19232,5 +19228,5 @@ #. 50000 #. -#. +#. #. #. @@ -19240,5 +19236,5 @@ #. 50000 #. -#. +#. #. #. @@ -19248,5 +19244,5 @@ #. 50000 #. -#. +#. #. #. @@ -19256,5 +19252,5 @@ #. 50000 #. -#. +#. #. #. @@ -19264,5 +19260,5 @@ #. 50000 #. -#. +#. #. #. @@ -19272,5 +19268,5 @@ #. 50000 #. -#. +#. #. #. @@ -19280,5 +19276,5 @@ #. 50000 #. -#. +#. #. #. @@ -19288,5 +19284,5 @@ #. 50000 #. -#. +#. #. #. @@ -19296,5 +19292,5 @@ #. 50000 #. -#. +#. #. #. @@ -19304,5 +19300,5 @@ #. 50000 #. -#. +#. #. #. @@ -19312,5 +19308,5 @@ #. 50000 #. -#. +#. #. #. @@ -19320,5 +19316,5 @@ #. 50000 #. -#. +#. #. #. @@ -19328,5 +19324,5 @@ #. 50000 #. -#. +#. #. #. @@ -19336,5 +19332,5 @@ #. 50000 #. -#. +#. #. #. @@ -19344,5 +19340,5 @@ #. 50000 #. -#. +#. #. #. @@ -19352,5 +19348,5 @@ #. 50000 #. -#. +#. #. #. @@ -19360,5 +19356,5 @@ #. 50000 #. -#. +#. #. #. @@ -19368,5 +19364,5 @@ #. 50000 #. -#. +#. #. #. @@ -19376,5 +19372,5 @@ #. 50000 #. -#. +#. #. #. @@ -19384,5 +19380,5 @@ #. 50000 #. -#. +#. #. #. @@ -19392,5 +19388,5 @@ #. 50000 #. -#. +#. #. #. @@ -19400,5 +19396,5 @@ #. 50000 #. -#. +#. #. #. @@ -19408,5 +19404,5 @@ #. 50000 #. -#. +#. #. #. @@ -19416,5 +19412,5 @@ #. 50000 #. -#. +#. #. #. @@ -19424,5 +19420,5 @@ #. 50000 #. -#. +#. #. #. @@ -19432,5 +19428,5 @@ #. 50000 #. -#. +#. #. #. @@ -19440,5 +19436,5 @@ #. 50000 #. -#. +#. #. #. @@ -19448,5 +19444,5 @@ #. 50000 #. -#. +#. #. #. @@ -19456,5 +19452,5 @@ #. 50000 #. -#. +#. #. #. @@ -19464,5 +19460,5 @@ #. 50000 #. -#. +#. #. #. @@ -19472,5 +19468,5 @@ #. 50000 #. -#. +#. #. #. @@ -19480,5 +19476,5 @@ #. 50000 #. -#. +#. #. #. @@ -19488,5 +19484,5 @@ #. 50000 #. -#. +#. #. #. @@ -19496,5 +19492,5 @@ #. 50000 #. -#. +#. #. #. @@ -19504,5 +19500,5 @@ #. 50000 #. -#. +#. #. #. @@ -19512,5 +19508,5 @@ #. 50000 #. -#. +#. #. #. @@ -19520,5 +19516,5 @@ #. 50000 #. -#. +#. #. #. @@ -19528,5 +19524,5 @@ #. 50000 #. -#. +#. #. #. @@ -19536,5 +19532,5 @@ #. 50000 #. -#. +#. #. #. @@ -19544,5 +19540,5 @@ #. 50000 #. -#. +#. #. #. @@ -19552,5 +19548,5 @@ #. 50000 #. -#. +#. #. #. @@ -19560,5 +19556,5 @@ #. 50000 #. -#. +#. #. #. @@ -21252,7 +21248,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21262,5 +21258,5 @@ #. 50000 #. -#. +#. #. #. @@ -21270,5 +21266,5 @@ #. 50000 #. -#. +#. #. #. @@ -21278,5 +21274,5 @@ #. 50000 #. -#. +#. #. #. @@ -21286,5 +21282,5 @@ #. 50000 #. -#. +#. #. #. @@ -21294,5 +21290,5 @@ #. 50000 #. -#. +#. #. #. @@ -21302,5 +21298,5 @@ #. 50000 #. -#. +#. #. #. @@ -21310,5 +21306,5 @@ #. 50000 #. -#. +#. #. #. @@ -22639,5 +22635,5 @@ #. 40000 #. -#. +#. #. #. @@ -22653,5 +22649,5 @@ #. 30000 #. -#. +#. #. #. @@ -22662,7 +22658,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22672,5 +22668,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22680,13 +22684,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22696,5 +22692,5 @@ #. 50000 #. -#. +#. #. #. @@ -22727,5 +22723,5 @@ #. 50000 #. -#. +#. #. #. @@ -22741,5 +22737,5 @@ #. 50000 #. -#. +#. #. #. @@ -22749,5 +22745,5 @@ #. 10000 #. -#. +#. #. #. @@ -22757,5 +22753,5 @@ #. 10000 #. -#. +#. #. #. @@ -22766,5 +22762,5 @@ #. 10000 #. -#. +#. #. #. @@ -22793,5 +22789,5 @@ #. 50000 #. -#. +#. #. #. @@ -22906,9 +22902,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 @@ -22916,5 +22912,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, @@ -22924,8 +22920,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 @@ -22939,5 +22935,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -22945,5 +22941,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -22992,6 +22988,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23071,5 +23067,5 @@ #. 40000 #. -#. +#. #. #. @@ -23079,5 +23075,5 @@ #. 10000 #. -#. +#. #. #. @@ -23086,5 +23082,5 @@ #. 50000 #. -#. +#. #. #. @@ -23094,5 +23090,5 @@ #. 50000 #. -#. +#. #. #. @@ -23101,5 +23097,5 @@ #. 50000 #. -#. +#. #. #. @@ -23108,5 +23104,5 @@ #. 50000 #. -#. +#. #. #. @@ -23115,5 +23111,5 @@ #. 50000 #. -#. +#. #. #. @@ -23122,5 +23118,5 @@ #. 50000 #. -#. +#. #. #. @@ -23129,5 +23125,5 @@ #. 40000 #. -#. +#. #. #. @@ -23136,5 +23132,5 @@ #. 50000 #. -#. +#. #. #. @@ -23143,5 +23139,5 @@ #. 50000 #. -#. +#. #. #. @@ -23150,5 +23146,5 @@ #. 50000 #. -#. +#. #. #. @@ -23157,5 +23153,5 @@ #. 50000 #. -#. +#. #. #. @@ -23164,5 +23160,5 @@ #. 50000 #. -#. +#. #. #. @@ -23171,5 +23167,5 @@ #. 50000 #. -#. +#. #. #. @@ -23179,5 +23175,5 @@ #. 50000 #. -#. +#. #. #. @@ -23186,5 +23182,5 @@ #. 50000 #. -#. +#. #. #. @@ -23195,5 +23191,5 @@ #. 50000 #. -#. +#. #. #. @@ -23205,11 +23201,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23218,7 +23214,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23229,5 +23225,5 @@ #. 50000 #. -#. +#. #. #. @@ -23238,5 +23234,5 @@ #. 50000 #. -#. +#. #. #. @@ -23247,5 +23243,5 @@ #. 50000 #. -#. +#. #. #. @@ -23256,5 +23252,5 @@ #. 50000 #. -#. +#. #. #. @@ -23265,5 +23261,5 @@ #. 50000 #. -#. +#. #. #. @@ -23274,5 +23270,5 @@ #. 40000 #. -#. +#. #. #. @@ -23284,5 +23280,5 @@ #. 50000 #. -#. +#. #. #. @@ -23293,5 +23289,5 @@ #. 50000 #. -#. +#. #. #. @@ -23316,5 +23312,5 @@ #. 10000 #. -#. +#. #. #. @@ -23323,5 +23319,5 @@ #. 50000 #. -#. +#. #. #. @@ -23330,5 +23326,5 @@ #. 50000 #. -#. +#. #. #. @@ -23344,5 +23340,5 @@ #. 20000 #. -#. +#. #. #. @@ -23356,5 +23352,5 @@ #. 30000 #. -#. +#. #. #. @@ -23363,5 +23359,5 @@ #. 50000 #. -#. +#. #. #. @@ -23370,5 +23366,5 @@ #. 50000 #. -#. +#. #. #. @@ -23377,5 +23373,5 @@ #. 50000 #. -#. +#. #. #. @@ -23384,5 +23380,5 @@ #. 50000 #. -#. +#. #. #. @@ -23391,5 +23387,5 @@ #. 50000 #. -#. +#. #. #. @@ -23398,5 +23394,5 @@ #. 50000 #. -#. +#. #. #. @@ -23405,5 +23401,5 @@ #. 50000 #. -#. +#. #. #. @@ -23412,5 +23408,5 @@ #. 50000 #. -#. +#. #. #. @@ -23419,5 +23415,5 @@ #. 50000 #. -#. +#. #. #. @@ -23426,5 +23422,5 @@ #. 50000 #. -#. +#. #. #. @@ -23433,5 +23429,5 @@ #. 50000 #. -#. +#. #. #. @@ -23440,5 +23436,5 @@ #. 50000 #. -#. +#. #. #. @@ -23447,5 +23443,5 @@ #. 50000 #. -#. +#. #. #. @@ -23454,5 +23450,5 @@ #. 50000 #. -#. +#. #. #. @@ -23623,7 +23619,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23637,5 +23633,5 @@ #. 40000 #. -#. +#. #. #. @@ -23645,7 +23641,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23655,5 +23651,5 @@ #. 50000 #. -#. +#. #. #. @@ -23663,5 +23659,5 @@ #. 50000 #. -#. +#. #. #. @@ -23671,5 +23667,5 @@ #. 50000 #. -#. +#. #. #. @@ -23679,5 +23675,5 @@ #. 50000 #. -#. +#. #. #. @@ -23693,5 +23689,5 @@ #. 10000 #. -#. +#. #. #. @@ -23701,5 +23697,5 @@ #. 50000 #. -#. +#. #. #. @@ -23709,5 +23705,5 @@ #. 50000 #. -#. +#. #. #. @@ -23717,5 +23713,5 @@ #. 50000 #. -#. +#. #. #. @@ -23725,5 +23721,5 @@ #. 50000 #. -#. +#. #. #. @@ -23733,5 +23729,5 @@ #. 50000 #. -#. +#. #. #. @@ -23741,5 +23737,5 @@ #. 50000 #. -#. +#. #. #. @@ -23758,5 +23754,5 @@ #. 50000 #. -#. +#. #. #. @@ -23765,5 +23761,5 @@ #. 50000 #. -#. +#. #. #. @@ -23777,5 +23773,5 @@ #. 50000 #. -#. +#. #. #. @@ -23789,5 +23785,5 @@ #. 50000 #. -#. +#. #. #. @@ -23796,5 +23792,5 @@ #. 50000 #. -#. +#. #. #. @@ -23808,5 +23804,5 @@ #. 50000 #. -#. +#. #. #. @@ -23821,5 +23817,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23834,5 +23830,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23846,5 +23842,5 @@ #. 50000 #. -#. +#. #. #. @@ -23858,5 +23854,5 @@ #. 50000 #. -#. +#. #. #. @@ -23865,5 +23861,5 @@ #. 50000 #. -#. +#. #. #. @@ -23872,5 +23868,5 @@ #. 50000 #. -#. +#. #. #. @@ -23884,5 +23880,5 @@ #. 50000 #. -#. +#. #. #. @@ -23892,5 +23888,5 @@ #. 50000 #. -#. +#. #. #. @@ -23899,5 +23895,5 @@ #. 50000 #. -#. +#. #. #. @@ -23906,5 +23902,5 @@ #. 50000 #. -#. +#. #. #. @@ -23913,5 +23909,5 @@ #. 50000 #. -#. +#. #. #. @@ -23921,5 +23917,5 @@ #. 50000 #. -#. +#. #. #. @@ -23930,5 +23926,5 @@ #. 50000 #. -#. +#. #. #. @@ -23938,7 +23934,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23948,5 +23944,5 @@ #. 50000 #. -#. +#. #. #. @@ -23956,5 +23952,5 @@ #. 50000 #. -#. +#. #. #. @@ -23964,5 +23960,5 @@ #. 50000 #. -#. +#. #. #. @@ -23973,5 +23969,5 @@ #. 50000 #. -#. +#. #. #. @@ -23981,5 +23977,5 @@ #. 50000 #. -#. +#. #. #. @@ -23989,5 +23985,5 @@ #. 50000 #. -#. +#. #. #. @@ -23997,5 +23993,5 @@ #. 50000 #. -#. +#. #. #. @@ -24005,5 +24001,5 @@ #. 50000 #. -#. +#. #. #. @@ -24013,5 +24009,5 @@ #. 50000 #. -#. +#. #. #. @@ -24021,5 +24017,5 @@ #. 50000 #. -#. +#. #. #. @@ -24029,5 +24025,5 @@ #. 50000 #. -#. +#. #. #. @@ -24037,5 +24033,5 @@ #. 50000 #. -#. +#. #. #. @@ -24058,7 +24054,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24068,5 +24064,5 @@ #. 50000 #. -#. +#. #. #. @@ -24075,5 +24071,5 @@ #. 50000 #. -#. +#. #. #. @@ -24083,5 +24079,5 @@ #. 50000 #. -#. +#. #. #. @@ -24090,5 +24086,5 @@ #. 50000 #. -#. +#. #. #. @@ -24098,5 +24094,5 @@ #. 50000 #. -#. +#. #. #. @@ -24106,5 +24102,5 @@ #. 50000 #. -#. +#. #. #. @@ -24120,5 +24116,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24129,5 +24125,5 @@ #. 50000 #. -#. +#. #. #. @@ -24146,5 +24142,5 @@ #. 50000 #. -#. +#. #. #. @@ -24154,5 +24150,5 @@ #. 50000 #. -#. +#. #. #. @@ -24165,5 +24161,5 @@ #. 50000 #. -#. +#. #. #. @@ -24181,5 +24177,5 @@ #. 50000 #. -#. +#. #. #. @@ -24188,5 +24184,5 @@ #. 50000 #. -#. +#. #. #. @@ -24195,5 +24191,5 @@ #. 50000 #. -#. +#. #. #. @@ -24202,7 +24198,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24213,5 +24209,5 @@ #. 50000 #. -#. +#. #. #. @@ -24226,5 +24222,5 @@ #. 50000 #. -#. +#. #. #. @@ -24238,5 +24234,5 @@ #. 50000 #. -#. +#. #. #. @@ -24246,5 +24242,5 @@ #. 50000 #. -#. +#. #. #. @@ -24258,5 +24254,5 @@ #. 50000 #. -#. +#. #. #. @@ -24270,5 +24266,5 @@ #. 50000 #. -#. +#. #. #. @@ -24277,7 +24273,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24287,5 +24283,5 @@ #. 50000 #. -#. +#. #. #. @@ -24295,5 +24291,5 @@ #. 50000 #. -#. +#. #. #. @@ -24303,5 +24299,5 @@ #. 50000 #. -#. +#. #. #. @@ -24311,5 +24307,5 @@ #. 50000 #. -#. +#. #. #. @@ -24325,7 +24321,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24340,5 +24336,5 @@ #. 30000 #. -#. +#. #. #. @@ -24353,5 +24349,5 @@ #. 30000 #. -#. +#. #. #. @@ -24366,5 +24362,5 @@ #. 30000 #. -#. +#. #. #. @@ -24379,5 +24375,5 @@ #. 30000 #. -#. +#. #. #. @@ -24392,5 +24388,5 @@ #. 30000 #. -#. +#. #. #. @@ -24405,7 +24401,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24415,5 +24411,5 @@ #. 50000 #. -#. +#. #. #. @@ -24422,5 +24418,5 @@ #. 50000 #. -#. +#. #. #. @@ -24430,5 +24426,5 @@ #. 50000 #. -#. +#. #. #. @@ -24438,5 +24434,5 @@ #. 50000 #. -#. +#. #. #. @@ -24446,5 +24442,5 @@ #. 50000 #. -#. +#. #. #. @@ -24454,5 +24450,5 @@ #. 50000 #. -#. +#. #. #. @@ -24462,5 +24458,5 @@ #. 50000 #. -#. +#. #. #. @@ -24470,5 +24466,5 @@ #. 50000 #. -#. +#. #. #. @@ -24478,5 +24474,5 @@ #. 50000 #. -#. +#. #. #. @@ -24486,5 +24482,5 @@ #. 50000 #. -#. +#. #. #. @@ -24494,5 +24490,5 @@ #. 50000 #. -#. +#. #. #. @@ -24502,5 +24498,5 @@ #. 50000 #. -#. +#. #. #. @@ -24510,5 +24506,5 @@ #. 50000 #. -#. +#. #. #. @@ -24528,5 +24524,5 @@ #. 50000 #. -#. +#. #. #. @@ -24541,5 +24537,5 @@ #. 50000 #. -#. +#. #. #. @@ -24552,7 +24548,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24562,5 +24558,5 @@ #. 50000 #. -#. +#. #. #. @@ -24570,5 +24566,5 @@ #. 50000 #. -#. +#. #. #. @@ -24578,5 +24574,5 @@ #. 50000 #. -#. +#. #. #. @@ -24586,5 +24582,5 @@ #. 50000 #. -#. +#. #. #. @@ -24594,5 +24590,5 @@ #. 50000 #. -#. +#. #. #. @@ -24602,5 +24598,5 @@ #. 50000 #. -#. +#. #. #. @@ -24610,5 +24606,5 @@ #. 50000 #. -#. +#. #. #. @@ -24618,5 +24614,5 @@ #. 50000 #. -#. +#. #. #. @@ -24626,5 +24622,5 @@ #. 50000 #. -#. +#. #. #. @@ -24634,5 +24630,5 @@ #. 50000 #. -#. +#. #. #. @@ -24642,5 +24638,5 @@ #. 50000 #. -#. +#. #. #. @@ -24650,5 +24646,5 @@ #. 50000 #. -#. +#. #. #. @@ -24658,5 +24654,5 @@ #. 50000 #. -#. +#. #. #. @@ -24666,5 +24662,5 @@ #. 50000 #. -#. +#. #. #. @@ -24685,5 +24681,5 @@ #. 50000 #. -#. +#. #. #. @@ -24697,7 +24693,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24707,5 +24703,5 @@ #. 50000 #. -#. +#. #. #. @@ -24715,5 +24711,5 @@ #. 50000 #. -#. +#. #. #. @@ -24723,5 +24719,5 @@ #. 50000 #. -#. +#. #. #. @@ -24731,5 +24727,5 @@ #. 50000 #. -#. +#. #. #. @@ -24739,5 +24735,5 @@ #. 50000 #. -#. +#. #. #. @@ -24747,5 +24743,5 @@ #. 50000 #. -#. +#. #. #. @@ -24755,5 +24751,5 @@ #. 50000 #. -#. +#. #. #. @@ -24770,5 +24766,5 @@ #. 50000 #. -#. +#. #. #. @@ -24778,5 +24774,5 @@ #. 50000 #. -#. +#. #. #. @@ -24786,5 +24782,5 @@ #. 50000 #. -#. +#. #. #. @@ -24794,5 +24790,5 @@ #. 50000 #. -#. +#. #. #. @@ -24802,5 +24798,5 @@ #. 50000 #. -#. +#. #. #. @@ -24810,5 +24806,5 @@ #. 50000 #. -#. +#. #. #. @@ -24818,5 +24814,5 @@ #. 50000 #. -#. +#. #. #. @@ -24826,5 +24822,5 @@ #. 50000 #. -#. +#. #. #. @@ -24834,5 +24830,5 @@ #. 50000 #. -#. +#. #. #. @@ -24842,5 +24838,5 @@ #. 50000 #. -#. +#. #. #. @@ -24850,5 +24846,5 @@ #. 50000 #. -#. +#. #. #. @@ -24858,5 +24854,5 @@ #. 50000 #. -#. +#. #. #. @@ -24875,5 +24871,5 @@ #. 50000 #. -#. +#. #. #. @@ -24883,5 +24879,5 @@ #. 50000 #. -#. +#. #. #. @@ -24890,5 +24886,5 @@ #. 50000 #. -#. +#. #. #. @@ -24898,5 +24894,5 @@ #. 50000 #. -#. +#. #. #. @@ -24906,5 +24902,5 @@ #. 50000 #. -#. +#. #. #. @@ -24914,5 +24910,5 @@ #. 50000 #. -#. +#. #. #. @@ -24921,5 +24917,5 @@ #. 50000 #. -#. +#. #. #. @@ -24929,5 +24925,5 @@ #. 50000 #. -#. +#. #. #. @@ -24937,5 +24933,5 @@ #. 50000 #. -#. +#. #. #. @@ -24945,5 +24941,5 @@ #. 50000 #. -#. +#. #. #. @@ -24953,5 +24949,5 @@ #. 50000 #. -#. +#. #. #. @@ -24960,5 +24956,5 @@ #. 50000 #. -#. +#. #. #. @@ -24967,5 +24963,5 @@ #. 50000 #. -#. +#. #. #. @@ -24974,5 +24970,5 @@ #. 50000 #. -#. +#. #. #. @@ -24981,5 +24977,5 @@ #. 50000 #. -#. +#. #. #. @@ -24988,5 +24984,5 @@ #. 50000 #. -#. +#. #. #. @@ -24995,5 +24991,5 @@ #. 50000 #. -#. +#. #. #. @@ -25002,5 +24998,5 @@ #. 50000 #. -#. +#. #. #. @@ -25009,5 +25005,5 @@ #. 50000 #. -#. +#. #. #. @@ -25016,5 +25012,5 @@ #. 50000 #. -#. +#. #. #. @@ -25023,5 +25019,5 @@ #. 50000 #. -#. +#. #. #. @@ -25030,5 +25026,5 @@ #. 50000 #. -#. +#. #. #. @@ -25037,5 +25033,5 @@ #. 50000 #. -#. +#. #. #. @@ -25044,5 +25040,5 @@ #. 50000 #. -#. +#. #. #. @@ -25052,5 +25048,5 @@ #. 50000 #. -#. +#. #. #. @@ -25060,5 +25056,5 @@ #. 50000 #. -#. +#. #. #. @@ -25068,5 +25064,5 @@ #. 50000 #. -#. +#. #. #. @@ -25076,5 +25072,5 @@ #. 50000 #. -#. +#. #. #. @@ -25084,5 +25080,5 @@ #. 50000 #. -#. +#. #. #. @@ -25092,5 +25088,5 @@ #. 50000 #. -#. +#. #. #. @@ -25100,5 +25096,5 @@ #. 50000 #. -#. +#. #. #. @@ -25108,5 +25104,5 @@ #. 50000 #. -#. +#. #. #. @@ -25116,5 +25112,5 @@ #. 50000 #. -#. +#. #. #. @@ -25125,5 +25121,5 @@ #. 50000 #. -#. +#. #. #. @@ -25133,5 +25129,5 @@ #. 50000 #. -#. +#. #. #. @@ -25141,5 +25137,5 @@ #. 50000 #. -#. +#. #. #. @@ -25149,5 +25145,5 @@ #. 50000 #. -#. +#. #. #. @@ -25157,5 +25153,5 @@ #. 50000 #. -#. +#. #. #. @@ -25165,5 +25161,5 @@ #. 50000 #. -#. +#. #. #. @@ -25173,5 +25169,5 @@ #. 50000 #. -#. +#. #. #. @@ -25181,5 +25177,5 @@ #. 50000 #. -#. +#. #. #. @@ -25189,5 +25185,5 @@ #. 50000 #. -#. +#. #. #. @@ -25197,5 +25193,5 @@ #. 50000 #. -#. +#. #. #. @@ -25205,5 +25201,5 @@ #. 50000 #. -#. +#. #. #. @@ -25213,5 +25209,5 @@ #. 50000 #. -#. +#. #. #. @@ -25221,5 +25217,5 @@ #. 50000 #. -#. +#. #. #. @@ -25229,5 +25225,5 @@ #. 50000 #. -#. +#. #. #. @@ -25237,5 +25233,5 @@ #. 50000 #. -#. +#. #. #. @@ -25245,5 +25241,5 @@ #. 50000 #. -#. +#. #. #. @@ -25253,5 +25249,5 @@ #. 50000 #. -#. +#. #. #. @@ -25261,5 +25257,5 @@ #. 50000 #. -#. +#. #. #. @@ -25269,5 +25265,5 @@ #. 50000 #. -#. +#. #. #. @@ -25276,5 +25272,5 @@ #. 50000 #. -#. +#. #. #. @@ -25306,5 +25302,5 @@ #. 50000 #. -#. +#. #. #. @@ -25314,5 +25310,5 @@ #. 50000 #. -#. +#. #. #. @@ -25322,7 +25318,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25337,5 +25333,5 @@ #. 50000 #. -#. +#. #. #. @@ -25345,5 +25341,5 @@ #. 50000 #. -#. +#. #. #. @@ -25353,5 +25349,5 @@ #. 50000 #. -#. +#. #. #. @@ -25361,5 +25357,5 @@ #. 50000 #. -#. +#. #. #. @@ -25369,5 +25365,5 @@ #. 50000 #. -#. +#. #. #. @@ -25377,5 +25373,5 @@ #. 50000 #. -#. +#. #. #. @@ -25385,5 +25381,5 @@ #. 50000 #. -#. +#. #. #. @@ -25399,7 +25395,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25409,5 +25405,5 @@ #. 50000 #. -#. +#. #. #. @@ -25417,5 +25413,5 @@ #. 50000 #. -#. +#. #. #. @@ -25425,5 +25421,5 @@ #. 50000 #. -#. +#. #. #. @@ -25433,5 +25429,5 @@ #. 50000 #. -#. +#. #. #. @@ -25441,5 +25437,5 @@ #. 50000 #. -#. +#. #. #. @@ -25449,5 +25445,5 @@ #. 50000 #. -#. +#. #. #. @@ -25457,5 +25453,5 @@ #. 50000 #. -#. +#. #. #. @@ -25465,5 +25461,5 @@ #. 50000 #. -#. +#. #. #. @@ -25473,5 +25469,5 @@ #. 50000 #. -#. +#. #. #. @@ -25481,5 +25477,5 @@ #. 50000 #. -#. +#. #. #. @@ -25489,5 +25485,5 @@ #. 50000 #. -#. +#. #. #. @@ -25497,5 +25493,5 @@ #. 50000 #. -#. +#. #. #. @@ -25505,5 +25501,5 @@ #. 50000 #. -#. +#. #. #. @@ -25513,5 +25509,5 @@ #. 50000 #. -#. +#. #. #. @@ -25521,5 +25517,5 @@ #. 50000 #. -#. +#. #. #. @@ -25529,5 +25525,5 @@ #. 50000 #. -#. +#. #. #. @@ -25537,5 +25533,5 @@ #. 50000 #. -#. +#. #. #. @@ -25545,5 +25541,5 @@ #. 50000 #. -#. +#. #. #. @@ -25553,5 +25549,5 @@ #. 50000 #. -#. +#. #. #. @@ -25561,5 +25557,5 @@ #. 50000 #. -#. +#. #. #. @@ -25569,5 +25565,5 @@ #. 50000 #. -#. +#. #. #. @@ -25577,5 +25573,5 @@ #. 50000 #. -#. +#. #. #. @@ -25585,5 +25581,5 @@ #. 50000 #. -#. +#. #. #. @@ -25593,5 +25589,5 @@ #. 50000 #. -#. +#. #. #. @@ -25601,5 +25597,5 @@ #. 50000 #. -#. +#. #. #. @@ -25609,5 +25605,5 @@ #. 50000 #. -#. +#. #. #. @@ -25617,5 +25613,5 @@ #. 50000 #. -#. +#. #. #. @@ -25625,5 +25621,5 @@ #. 50000 #. -#. +#. #. #. @@ -25633,5 +25629,5 @@ #. 50000 #. -#. +#. #. #. @@ -25641,5 +25637,5 @@ #. 50000 #. -#. +#. #. #. @@ -25649,5 +25645,5 @@ #. 50000 #. -#. +#. #. #. @@ -25657,5 +25653,5 @@ #. 50000 #. -#. +#. #. #. @@ -25665,5 +25661,5 @@ #. 50000 #. -#. +#. #. #. @@ -25673,5 +25669,5 @@ #. 50000 #. -#. +#. #. #. @@ -25681,5 +25677,5 @@ #. 50000 #. -#. +#. #. #. @@ -25689,5 +25685,5 @@ #. 50000 #. -#. +#. #. #. @@ -25697,5 +25693,5 @@ #. 50000 #. -#. +#. #. #. @@ -25705,5 +25701,5 @@ #. 50000 #. -#. +#. #. #. @@ -25713,5 +25709,5 @@ #. 50000 #. -#. +#. #. #. @@ -25721,5 +25717,5 @@ #. 50000 #. -#. +#. #. #. @@ -25729,5 +25725,5 @@ #. 50000 #. -#. +#. #. #. @@ -25737,5 +25733,5 @@ #. 50000 #. -#. +#. #. #. @@ -25771,7 +25767,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25781,5 +25777,5 @@ #. 50000 #. -#. +#. #. #. @@ -25789,5 +25785,5 @@ #. 50000 #. -#. +#. #. #. @@ -25797,5 +25793,5 @@ #. 50000 #. -#. +#. #. #. @@ -25805,5 +25801,5 @@ #. 50000 #. -#. +#. #. #. @@ -25813,5 +25809,5 @@ #. 50000 #. -#. +#. #. #. @@ -25821,5 +25817,5 @@ #. 50000 #. -#. +#. #. #. @@ -25829,5 +25825,5 @@ #. 50000 #. -#. +#. #. #. @@ -25844,5 +25840,5 @@ #. 50000 #. -#. +#. #. #. @@ -25852,5 +25848,5 @@ #. 50000 #. -#. +#. #. #. @@ -25860,5 +25856,5 @@ #. 50000 #. -#. +#. #. #. @@ -25868,5 +25864,5 @@ #. 50000 #. -#. +#. #. #. @@ -25876,5 +25872,5 @@ #. 50000 #. -#. +#. #. #. @@ -25884,5 +25880,5 @@ #. 50000 #. -#. +#. #. #. @@ -25893,5 +25889,5 @@ #. 50000 #. -#. +#. #. #. @@ -25901,5 +25897,5 @@ #. 50000 #. -#. +#. #. #. @@ -25909,5 +25905,5 @@ #. 40000 #. -#. +#. #. #. @@ -25917,5 +25913,5 @@ #. 50000 #. -#. +#. #. #. @@ -25924,5 +25920,5 @@ #. 40000 #. -#. +#. #. #. @@ -25931,5 +25927,5 @@ #. 40000 #. -#. +#. #. #. @@ -25947,7 +25943,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25957,5 +25953,5 @@ #. 50000 #. -#. +#. #. #. @@ -25965,5 +25961,5 @@ #. 50000 #. -#. +#. #. #. @@ -25973,5 +25969,5 @@ #. 50000 #. -#. +#. #. #. @@ -25981,5 +25977,5 @@ #. 50000 #. -#. +#. #. #. @@ -25989,5 +25985,5 @@ #. 50000 #. -#. +#. #. #. @@ -25997,5 +25993,5 @@ #. 50000 #. -#. +#. #. #. @@ -26005,5 +26001,5 @@ #. 50000 #. -#. +#. #. #. @@ -26013,5 +26009,5 @@ #. 50000 #. -#. +#. #. #. @@ -26021,5 +26017,5 @@ #. 50000 #. -#. +#. #. #. @@ -26038,5 +26034,5 @@ #. 50000 #. -#. +#. #. #. @@ -26050,5 +26046,5 @@ #. 50000 #. -#. +#. #. #. @@ -26062,5 +26058,5 @@ #. 50000 #. -#. +#. #. #. @@ -26070,5 +26066,5 @@ #. 50000 #. -#. +#. #. #. @@ -26082,5 +26078,5 @@ #. 50000 #. -#. +#. #. #. @@ -26094,5 +26090,5 @@ #. 50000 #. -#. +#. #. #. @@ -26106,6 +26102,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26115,5 +26111,5 @@ #. 50000 #. -#. +#. #. #. @@ -26127,5 +26123,5 @@ #. 50000 #. -#. +#. #. #. @@ -26139,5 +26135,5 @@ #. 50000 #. -#. +#. #. #. @@ -26151,5 +26147,5 @@ #. 50000 #. -#. +#. #. #. @@ -26163,5 +26159,5 @@ #. 50000 #. -#. +#. #. #. @@ -26175,5 +26171,5 @@ #. 50000 #. -#. +#. #. #. @@ -26183,7 +26179,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26193,5 +26189,5 @@ #. 50000 #. -#. +#. #. #. @@ -26201,5 +26197,5 @@ #. 50000 #. -#. +#. #. #. @@ -26209,5 +26205,5 @@ #. 50000 #. -#. +#. #. #. @@ -26217,5 +26213,5 @@ #. 50000 #. -#. +#. #. #. @@ -26232,5 +26228,5 @@ #. 50000 #. -#. +#. #. #. @@ -26243,5 +26239,5 @@ #. 50000 #. -#. +#. #. #. @@ -26255,5 +26251,5 @@ #. 50000 #. -#. +#. #. #. @@ -26267,5 +26263,5 @@ #. 50000 #. -#. +#. #. #. @@ -26279,5 +26275,5 @@ #. 50000 #. -#. +#. #. #. @@ -26288,5 +26284,5 @@ #. 50000 #. -#. +#. #. #. @@ -26296,5 +26292,5 @@ #. 50000 #. -#. +#. #. #. @@ -26304,5 +26300,5 @@ #. 50000 #. -#. +#. #. #. @@ -26312,5 +26308,5 @@ #. 50000 #. -#. +#. #. #. @@ -26320,5 +26316,5 @@ #. 50000 #. -#. +#. #. #. @@ -26335,5 +26331,5 @@ #. 50000 #. -#. +#. #. #. @@ -26347,5 +26343,5 @@ #. 50000 #. -#. +#. #. #. @@ -26359,5 +26355,5 @@ #. 50000 #. -#. +#. #. #. @@ -26371,5 +26367,5 @@ #. 50000 #. -#. +#. #. #. @@ -26383,5 +26379,5 @@ #. 50000 #. -#. +#. #. #. @@ -26395,5 +26391,5 @@ #. 50000 #. -#. +#. #. #. @@ -26402,7 +26398,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26412,5 +26408,5 @@ #. 50000 #. -#. +#. #. #. @@ -26420,5 +26416,5 @@ #. 50000 #. -#. +#. #. #. @@ -26428,5 +26424,5 @@ #. 50000 #. -#. +#. #. #. @@ -26436,5 +26432,5 @@ #. 50000 #. -#. +#. #. #. @@ -26444,5 +26440,5 @@ #. 50000 #. -#. +#. #. #. @@ -26452,5 +26448,5 @@ #. 50000 #. -#. +#. #. #. @@ -26460,5 +26456,5 @@ #. 50000 #. -#. +#. #. #. @@ -26475,7 +26471,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26485,5 +26481,5 @@ #. 50000 #. -#. +#. #. #. @@ -26493,5 +26489,5 @@ #. 50000 #. -#. +#. #. #. @@ -26501,5 +26497,5 @@ #. 50000 #. -#. +#. #. #. @@ -26509,5 +26505,5 @@ #. 50000 #. -#. +#. #. #. @@ -26523,5 +26519,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26570,5 +26566,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26578,5 +26574,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26586,5 +26582,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26594,5 +26590,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26602,5 +26598,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26610,5 +26606,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26618,5 +26614,5 @@ #. 50000 #. -#. +#. #. #. @@ -26626,5 +26622,5 @@ #. 50000 #. -#. +#. #. #. @@ -26634,5 +26630,5 @@ #. 50000 #. -#. +#. #. #. @@ -26642,5 +26638,5 @@ #. 50000 #. -#. +#. #. #. @@ -26650,5 +26646,5 @@ #. 50000 #. -#. +#. #. #. @@ -26658,5 +26654,5 @@ #. 50000 #. -#. +#. #. #. @@ -26676,5 +26672,5 @@ #. 50000 #. -#. +#. #. #. @@ -26683,5 +26679,5 @@ #. 50000 #. -#. +#. #. #. @@ -26690,5 +26686,5 @@ #. 50000 #. -#. +#. #. #. @@ -26697,5 +26693,5 @@ #. 40000 #. -#. +#. #. #. @@ -26704,5 +26700,5 @@ #. 40000 #. -#. +#. #. #. @@ -26711,5 +26707,5 @@ #. 40000 #. -#. +#. #. #. @@ -26804,5 +26800,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -26810,28 +26806,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 @@ -26946,5 +26942,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -26957,5 +26953,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -26980,6 +26976,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -26988,6 +26984,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27002,6 +26998,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 @@ -27015,6 +27011,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 @@ -27034,6 +27030,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27057,6 +27053,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 @@ -27069,4 +27065,52 @@ msgstr "" +#~ msgid "Images for {0}" +#~ msgstr "Imagini pentru {0}" + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Nu există timp pentru punctul {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Nu pot citi timpul \"{0}\" din punctul {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Nu am găsit imagini cu mărci de timp citibile." + +#~ msgid "GPS start: {0}" +#~ msgstr "Start GPS: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "Sfârşit GPS: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "diferentă curentă: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "diferenţă zonă de timp: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} în urmă." + +#~ msgid "Sync clock" +#~ msgstr "Sincronizare ceas" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Datele din fişierul \"{0}\" nu au putut fi interpretate." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Nu există timp EXIF în fişierul \"{0}\"." + +#~ msgid "Image" +#~ msgstr "Imagine" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Sincronizare timp cu unitatea GPS" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Timpul introdus nu a putut fi interpretat." + #~ msgid "Unknown version" #~ msgstr "Versiune necunoscută" @@ -27085,9 +27129,9 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" -#~ "Readu toate obiectele selectate curent la starea din versiunea selectată în " -#~ "lista de istoric." +#~ "Readu toate obiectele selectate curent la starea din versiunea selectată " +#~ "în lista de istoric." #~ msgid "Merging conflicts." @@ -27138,7 +27182,4 @@ #~ msgstr "Nu au fost importate date." -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Vă rog întâi introduceţi coordonatele dorite." - #~ msgid "Select a bookmark first." #~ msgstr "Selectaţi întâi un semn de carte." @@ -27153,5 +27194,4 @@ #~ msgstr "Extensie fişier necunoscută." -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" Index: /applications/editors/josm/i18n/po/ru.po =================================================================== --- /applications/editors/josm/i18n/po/ru.po (revision 18974) +++ /applications/editors/josm/i18n/po/ru.po (revision 18975) @@ -8,14 +8,14 @@ "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-28 22:25+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-12-04 15:16+0000\n" +"Last-Translator: Calibrator \n" "Language-Team: Koptev Oleg \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:05+0000\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" @@ -32,6 +32,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 @@ -48,7 +48,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 @@ -64,19 +64,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 @@ -89,9 +88,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" @@ -119,5 +118,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 @@ -140,9 +139,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 @@ -158,20 +157,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 @@ -190,7 +185,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 "Ошибка" @@ -270,5 +265,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 "Модули" @@ -316,4 +311,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 @@ -321,8 +318,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 @@ -332,29 +329,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 @@ -385,9 +380,9 @@ #, java-format msgid "" -"There are no layers the source layer
''{0}''
could be merged " -"to." -msgstr "" -"Нет слоёв, с которым исходный слой
''{0}''
может быть " -"объединён." +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" +"Нет слоёв, с которым исходный слой
''{0}''
может быть объединён." +"" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 @@ -438,14 +433,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 "Долгота" @@ -453,17 +448,17 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 msgid "Please enter a valid latitude in the range -90..90" -msgstr "" +msgstr "Пожалуйста , введите правильную широту в диапазоне -90..90" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 msgid "Please enter a latitude in the range -90..90" -msgstr "" +msgstr "Введите широту в диапазоне -90..90" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 msgid "Please enter a valid longitude in the range -180..180" -msgstr "" +msgstr "Пожалуйста, введите правильную долготу в диапазоне -180..180" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 msgid "Please enter a longitude in the range -180..180" -msgstr "" +msgstr "Введите долготу в диапазоне -180..180" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 @@ -471,10 +466,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 @@ -486,9 +481,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 msgid "Close the dialog and create a new node" -msgstr "" +msgstr "Закрыть диалог и создать новую точку" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 msgid "Close the dialog, don't create a new node" -msgstr "" +msgstr "Закрыть диалог, не создавая новую точку" #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 @@ -505,19 +500,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 @@ -526,9 +524,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 @@ -544,7 +539,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 @@ -556,11 +551,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" @@ -586,22 +581,22 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 msgid "data" -msgstr "данные" +msgstr "данных" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 msgid "layer" -msgstr "слой" +msgstr "слоя" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 msgid "selection" -msgstr "выделение" +msgstr "выделения" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 msgid "conflict" -msgstr "конфликт" +msgstr "конфликта" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 msgid "download" -msgstr "скачанное" +msgstr "скачанного" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56 @@ -649,5 +644,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}" @@ -702,10 +697,10 @@ "последовательностью точек." -#: ../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 "Выделите не менее двух линий для объединения." @@ -724,19 +719,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 " @@ -748,9 +743,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 @@ -822,21 +817,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" @@ -844,6 +843,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 @@ -872,5 +871,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 "Дублировать" @@ -900,14 +899,14 @@ #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30 msgid "Fullscreen View" -msgstr "" +msgstr "Полноэкранный режим" #. no icon #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32 msgid "Toggle fullscreen view" -msgstr "" +msgstr "Переключить полноэкранный режим" #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33 msgid "Toggle Fullscreen view" -msgstr "" +msgstr "Переключить полноэкранный режим" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -927,8 +926,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 @@ -936,5 +933,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 @@ -947,8 +944,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 @@ -967,8 +964,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 @@ -991,13 +988,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 @@ -1037,4 +1035,108 @@ msgstr "Показать информацию об объектах OSM: линиях, точках или отношениях." +#: ../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 "\"{0}\" не замкнут, и поэтому они не могут быть объединены." + +#: ../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 "" +"Выделенные линии содержат точки, находящиеся за пределами\n" +"скачанной области. Некоторые точки могут быть случайно\n" +"удалены. Вы действительно хотите продолжить?" + +#: ../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 @@ -1054,4 +1156,48 @@ 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 "Введите Lat / Lon, чтобы перейти к позиции." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 +msgid "You can also paste an URL from www.openstreetmap.org" +msgstr "Вы также можете вставить URL из www.openstreetmap.org" + +#: ../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 "URL" + +#: ../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" @@ -1062,26 +1208,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 "" @@ -1091,5 +1237,5 @@ "используется." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231 #, java-format msgid "Merge {0} nodes" @@ -1280,6 +1426,6 @@ "Вы используете проекцию EPSG:4326, это может привести
к " "нежелательному результату при выравнивании многоугольника.
Смените " -"проекцию, чтобы избавиться от этого предупреждения.
Вы хотите " -"продолжить?" +"проекцию, чтобы избавиться от этого предупреждения.
Вы хотите продолжить?" +"" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167 @@ -1475,6 +1621,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 "" "Отображает отчёт о состоянии, содержащий полезную информацию, которую можно " @@ -1496,9 +1641,43 @@ #: ../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] "Выделена {0} линия. Вы уверены, что хотите упростить её?" +msgstr[1] "Выделено {0} линии. Вы уверены, что хотите упростить их все?" +msgstr[2] "Выделено {0} линий. Вы уверены, что хотите упростить их все?" + +#: ../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] "Упростить линию (удалить {0} точку)" +msgstr[1] "Упростить линию (удалить {0} точки)" +msgstr[2] "Упростить линию (удалить {0} точек)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1569,6 +1748,6 @@ msgstr "" "Роль, основанная на участии в отношениях была скопирована во все новые " -"линии.
Результат необходимо проверить и исправить, если " -"потребуется." +"линии.
Результат необходимо проверить и исправить, если потребуется." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 @@ -1638,6 +1817,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 "" "* Одна точка, используемая несколькими линиями и одной из этих линий, либо" @@ -1719,24 +1897,24 @@ #. 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 "Объект с id {0} не найден в текущем наборе данных" -#: ../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)" @@ -1745,30 +1923,30 @@ "заново)" -#: ../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:127 +#: ../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:128 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 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 "Передать все изменения в активном слое на сервер OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 #, java-format msgid "" @@ -1779,35 +1957,35 @@ "устранить." -#: ../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 "Синхронизировать только точку {0}" -#: ../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 "Синхронизировать только линию {0}" -#: ../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 "Синхронизировать только отношение {0}" -#: ../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 "" @@ -1815,9 +1993,8 @@ "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.
" +"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 "" "Загрузка на сервер прервана так как на сервере есть " @@ -1825,23 +2002,22 @@ "конфликта является {0} с id {1},
версия " "данных на сервере {2}, ваша версия {3}.

Нажмите {4}, " -"чтобы синхронизировать только конфликтный элемент.
Нажмите " -"{5}, чтобы синхронизировать весь локальный набор данных с " -"сервером.
Нажмите {6}, чтобы прервать, затем продолжите " +"чтобы синхронизировать только конфликтный элемент.
Нажмите {5}, чтобы синхронизировать весь локальный набор данных с сервером." +"
Нажмите {6}, чтобы прервать, затем продолжите " "редактирование.
" -#: ../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 +#: ../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.
" +"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 "" "Загрузка на сервер не удалась, так как на сервере " @@ -1851,5 +2027,5 @@ "продолжите редактирование.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1859,27 +2035,26 @@ msgstr "" "Загрузка на сервер не удалась потому что вы " -"используете
пакет правок {0}, который уже был закрыт в " -"{1}.
Пожалуйста, загрузите снова, используя новый или существующий " -"открытый пакет правок." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 +"используете
пакет правок {0}, который уже был закрыт в {1}." +"
Пожалуйста, загрузите снова, используя новый или существующий открытый " +"пакет правок." + +#: ../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 "" -"Щёлкните, чтобы скачать с сервера все родительские линии для точки {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 +msgstr "Щёлкните, чтобы скачать с сервера все родительские линии для точки {0}" + +#: ../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 "" @@ -1895,10 +2070,10 @@ "устранить в диалоге устранения конфликтов." -#: ../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" @@ -1907,5 +2082,5 @@ "образцу" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 msgid "Updating primitive" msgstr "Обновление элемента" @@ -1917,6 +2092,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 "" @@ -1927,5 +2102,5 @@ "снова на сервер, но без этого объекта." -#: ../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." @@ -1934,35 +2109,34 @@ "сервер." -#: ../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 "Передача объектов на сервер. Кол-во: {0}..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 -#, java-format -msgid "" -"Ignoring caught exception because upload is canceled. Exception is: {0}" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" msgstr "" "Игнорирование выявленного исключения, так как загрузка на сервер отменена. " "Исключение: {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45 +#: ../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 "Загрузить на сервер OSM все изменения в выбранном." -#: ../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 "Чтение родителей для ''{0}''" -#: ../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 "Проверка на удалённых родителей в локальном наборе данных" @@ -1975,5 +2149,5 @@ #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:25 msgid "Enable/disable rendering the map as wireframe only" -msgstr "" +msgstr "Позволить/запретить отрисовку карты только в виде каркаса" #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26 @@ -2130,12 +2304,12 @@ "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 "" "Кол-во элементов в вашем наборе данных: {0}
Они могут быть удалены " "на сервере. В дальнейшем, если вы попытаетесь удалить или
обновить их, " -"сервер скорее всего сообщит о
конфликте.

Нажмите " -"{1} что бы проверить состояние этих элементов
на " -"сервере.
Нажмите {2} чтобы проигнорировать.
" +"сервер скорее всего сообщит о
конфликте.

Нажмите {1} что бы проверить состояние этих элементов
на сервере.
Нажмите " +"{2} чтобы проигнорировать.
" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183 @@ -2206,38 +2380,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." @@ -2247,14 +2421,14 @@ msgstr[2] "Вставить новую точку в {0} линий" -#: ../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 "Закончено вычерчивание" @@ -2293,6 +2467,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 "" "Передвиньте значок с лапкой проигрывателя и отпустите возле трека для " @@ -2401,5 +2575,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." @@ -2459,6 +2633,6 @@ "type=, *=*, *=" msgstr "" -"type=* - ключ 'type' с любым значением. Также попробуйте " -"*=value, type=, *=*, *=" +"type=* - ключ 'type' с любым значением. Также попробуйте *=value, type=, *=*, *=" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 @@ -2478,6 +2652,6 @@ "type: - type of the object (node, way, relation)" msgstr "" -"type:object_type, где object_type - node(точка), " -"way(линия), relation(отношение)" +"type:object_type, где object_type - node(точка), way" +"(линия), relation(отношение)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 @@ -2486,36 +2660,41 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - все объекты, измененные заданным пользователем" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - объект с данным ID (0 для новых объектов)" -#: ../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-" "max)" msgstr "" -"tags:... - объект с заданным количеством тегов (tags:кол-во или " -"tags:мин-макс)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +"tags:... - объект с заданным количеством тегов (tags:кол-во или tags:" +"мин-макс)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "modified - all changed objects" msgstr "modified - все измененные объекты" -#: ../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 "selected - все выделенные объекты" -#: ../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 "incomplete - все незаконченные объекты" -#: ../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 "untagged - все объекты без тегов" -#: ../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" @@ -2524,5 +2703,5 @@ "выражению" -#: ../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" @@ -2531,5 +2710,5 @@ "выражению" -#: ../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 "" @@ -2537,5 +2716,5 @@ "«или»" -#: ../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 "" @@ -2543,9 +2722,9 @@ "ключ содержит двоеточие)" -#: ../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 "Используйте ( and ) для группировки выражений" -#: ../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 @@ -2555,55 +2734,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 "Ничего не добавлено к выделению в результате поиска ''{0}''" -#: ../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 "Ничего не удалено из выделения в результате поиска ''{0}''" -#: ../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 "Ничего не найдено в выделенном, при поиске ''{0}''" -#: ../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 "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2616,5 +2795,5 @@ "{2}" -#: ../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 "" @@ -2622,10 +2801,10 @@ "использования: ключ=значение" -#: ../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 "Ошибка синтаксиса шаблона: Шаблон {0} в {1} недопустим!" -#: ../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" @@ -2634,26 +2813,26 @@ "отношение" -#: ../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 "Неожиданный знак: {0}" -#: ../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 "Неверное количество параметров оператора tags." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 #, java-format msgid "" @@ -2664,9 +2843,9 @@ "выходящее за пределы допустимого диапазона, например: tags:1 или tags:2-5" -#: ../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 "" @@ -2677,5 +2856,5 @@ "или диапазон, например, точки:10-20" -#: ../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." @@ -2717,6 +2896,6 @@ "{0}, max is {1}" msgstr "" -"Текущее число изменений превысило максимальное, текущее - {0}, максимальное -" -" {1}" +"Текущее число изменений превысило максимальное, текущее - {0}, максимальное " +"- {1}" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54 @@ -2726,8 +2905,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" +#, fuzzy, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" msgstr "" "Предупреждение: автоматическое усечение значения тега ''{0}'' на удалённом " @@ -2735,7 +2913,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2765,6 +2943,6 @@ "dependency." msgstr "" -"{0} отношения создали цикл, так как они ссылаются друг на " -"друга.
JOSM не может загрузить их на сервер. Пожалуйста, отредактируйте " +"{0} отношения создали цикл, так как они ссылаются друг на друга." +"
JOSM не может загрузить их на сервер. Пожалуйста, отредактируйте " "отношения, удалив циклические ссылки." @@ -2877,9 +3055,9 @@ "conflict can't be added." msgstr "" -"В слое ''{0}'' уже есть конфликт для " -"элемента
''{1}''.
Невозможно добавить данный конфликт." +"В слое ''{0}'' уже есть конфликт для элемента
''{1}''." +"
Невозможно добавить данный конфликт." #: ../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 "Двойной конфликт" @@ -2900,10 +3078,10 @@ #: ../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 "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "" -"Невозможно вернуть команду ''{0}'' потому что слоя ''{1}'' больше нет" +msgstr "Невозможно вернуть команду ''{0}'' потому что слоя ''{1}'' больше нет" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 @@ -2918,20 +3096,20 @@ msgstr "не могу устранить нерешенный конфликт" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 +#: ../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 "Параметр ''{0}'' не должен быть пустым" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61 +#: ../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:107 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 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" @@ -2941,5 +3119,5 @@ msgstr[2] "Удалить {0} объектов" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2949,5 +3127,5 @@ msgstr[2] "Удалить {0} точек" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2957,5 +3135,5 @@ msgstr[2] "Удалить {0} линий" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2967,16 +3145,16 @@ #. 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 "Удалить подтверждение" @@ -2995,15 +3173,15 @@ msgstr[2] "Переместить {0} точек" -#: ../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 "Очищеный объект ''{0}''" -#: ../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 "Очищено объектов: {0}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154 #, java-format msgid "" @@ -3014,5 +3192,5 @@ "Текущее значение {1}" -#: ../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}" @@ -3023,9 +3201,4 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Устранить конфликты в списке участников отношения {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "Невозможно отменить команду ''{0}'' так как отсутствует слой ''{1}''" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3105,5 +3278,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 " @@ -3262,6 +3435,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 "" "Файл настроек содержит ошибки.
Этот файл будет переименован в " @@ -3356,5 +3529,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3363,5 +3536,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3369,25 +3542,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 @@ -3414,25 +3587,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 "Отстутствует результат слияния для линии с id {0}" -#: ../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 "Отстутствует результат слияния для точки с id {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Отстутствует результат слияния для объекта с id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 -#, java-format -msgid "Missing merge target for node with id {0}" -msgstr "Отстутствует результат слияния для точки с id {0}" - -#: ../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 "Отстутствует результат слияния для отношения с id {0}" -#: ../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}" @@ -3440,6 +3614,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 "" @@ -3505,24 +3679,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 "обнаружен id >= 0. Получено {0}" -#: ../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 "Элемент с id=0 не может быть невидимым" -#: ../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 "обнаружено id > 0. Получено {0}" -#: ../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 "обнаружена версия > 0. Получено {0}" -#: ../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 " @@ -3532,5 +3706,5 @@ "другой нет" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 #, java-format msgid "" @@ -3566,6 +3740,6 @@ "Найден пользователь с тем же идентификатором пользователя, но с другим именем" -#: ../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}." @@ -3583,9 +3757,7 @@ #, java-format msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''." -msgstr "" -"параметр ''{0}'' должен быть в интервале 0..{1}, текущее значение {2}" +msgstr "параметр ''{0}'' должен быть в интервале 0..{1}, текущее значение {2}" #: ../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 @@ -3597,6 +3769,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 "Невозможно сравнить элемент с ID ''{0}'' и элемент с ID ''{1}''." @@ -3607,113 +3778,113 @@ msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}" -#: ../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 "Найдено больше одного \"via\" (через)." -#: ../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 "Не найдена точка или линия \"via\" (через)." -#: ../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 "" "Линия \"from\" (от) не начинается или заканчивается на точке \"via\" (через)." +#: ../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 "" +"Линия \"to\" (до) не начинается и не заканчивается на точке \"via\" (через)." + #: ../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 "" -"Линия \"to\" (до) не начинается и не заканчивается на точке \"via\" (через)." - -#: ../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 "" -"Линия \"from\" (от) не начинается и не заканчивается на линии \"via\" " -"(через)." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672 +"Линия \"from\" (от) не начинается и не заканчивается на линии \"via" +"\" (через)." + +#: ../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 "" "Линия \"to\" (до) не начинается и не заканчивается на линии \"via\" (через)." -#: ../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 "Стиль для ограничения {0} не найден." -#: ../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 "Персечение между линиями ''{0}'' и ''{1}''." -#: ../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 "Нет полезной роли ''{0}'' для пути ''{1}''." -#: ../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 "не-линия ''{0}'' области с вложениями" -#: ../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 "Для области с вложениями «{0}» отсутствует внешняя линия." -#: ../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." @@ -3721,27 +3892,27 @@ "Стиль для внутренней линии ''{0}'' такой же, как у области с вложениями." -#: ../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 "Стиль для внешней линии ''{0}'' отсутствует." -#: ../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}" @@ -3753,5 +3924,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 @@ -3772,5 +3943,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 @@ -3791,5 +3962,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 "фон" @@ -3813,4 +3984,6 @@ "NTF<->RGF93 grid" msgstr "" +"Предупреждение: не удалось открыть входящий поток для ресурса ''/data/{0}''. " +"Невозможно загрузить решётку NTF<->RGF93" #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137 @@ -3907,6 +4080,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 "" "Невозможно прочесть закладки с
''{0}''
Текст ошибки: {1}" @@ -3922,5 +4094,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 @@ -3928,32 +4100,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" @@ -3963,5 +4135,5 @@ msgstr[2] "{0} точек" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -4216,12 +4388,12 @@ "используется." -#: ../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 @@ -4235,19 +4407,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 @@ -4258,5 +4430,5 @@ msgstr "Меню: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Аудио" @@ -4300,41 +4472,41 @@ 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 " "this list with the mouse.
" msgstr "" -"Нажмите на среднюю клавишу ещё раз, чтобы переключиться на следующий " -"элемент.
Удерживайте CTRL, чтобы выбрать мышкой, напрямую из списка.
" - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +"Нажмите на среднюю клавишу ещё раз, чтобы переключиться на следующий элемент." +"
Удерживайте CTRL, чтобы выбрать мышкой, напрямую из списка.
" + +#: ../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 "Пользователь:" @@ -4391,6 +4563,6 @@ "relations." msgstr "" -"Пожалуйста, подтвердите удаление 1 объекта из " -"{0} отношений." +"Пожалуйста, подтвердите удаление 1 объекта из " +"{0} отношений." #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 @@ -4447,5 +4619,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" @@ -4454,5 +4626,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" @@ -4461,5 +4633,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" @@ -4478,5 +4650,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 @@ -4493,5 +4665,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" @@ -4567,6 +4739,6 @@ 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}." @@ -4574,16 +4746,16 @@ "текущее значение параметра вне допустимой области: текущее значение {0}" -#: ../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 "Список в роли {0} в настоящий момент не учавствует в сравнении пары." -#: ../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 "недопустимое значение параметра \"index\". Текущее значение {0}" -#: ../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." @@ -4605,6 +4777,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" -msgstr "" -"Список элементов в моём наборе данных, то есть локальном наборе данных" +msgstr "Список элементов в моём наборе данных, то есть локальном наборе данных" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 @@ -4645,6 +4816,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." -msgstr "" -"Скопировать выделенные элементы в конец списка объединённых элементов" +msgstr "Скопировать выделенные элементы в конец списка объединённых элементов" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 @@ -4671,6 +4841,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 "" "Скопировать их выделенные элементы в конец списка объединённых элементов" @@ -4744,6 +4913,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" "Нажмите {0}, чтобы начать объединение моих и их " @@ -4753,6 +4922,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" "Нажмите {0}, чтобы закончить объединение моих и их " @@ -4818,9 +4987,9 @@ #, java-format msgid "" -"An error occurred while communicating with the server
Details: " -"{0}" -msgstr "" -"Произошла ошибка во время соединения с сервером
Подробности: " -"{0}" +"An error occurred while communicating with the server
Details: {0}" +msgstr "" +"Произошла ошибка во время соединения с сервером
Подробности: {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 @@ -4845,6 +5014,6 @@ msgstr "" "Существует {0} дополнительных точек используемых треком {1}
, " -"которые удалены на сервере.

Вы хотите восстановить эти точки " -"тоже?" +"которые удалены на сервере.

Вы хотите восстановить эти точки тоже?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 @@ -4855,11 +5024,11 @@ #, 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 "" "Существуют дополнительные элементы ( {0} шт.), связанные с отношением " -"{1}
, которые удалены с сервера.

Вы хотите восстановить их " -"тоже?" +"{1}
, которые удалены с сервера.

Вы хотите восстановить их тоже?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 @@ -5011,5 +5180,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 "" @@ -5148,5 +5317,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 "Применить" @@ -5248,7 +5417,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" @@ -5259,6 +5428,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" @@ -5294,7 +5463,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 "Роль:" @@ -5313,6 +5480,6 @@ "modified relations." msgstr "" -"Отметьте, какой тег будет назначен
на все изменённые " -"отношения." +"Отметьте, какой тег будет назначен
на все изменённые отношения." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106 @@ -5334,6 +5501,6 @@ "Enter a tag value, i.e. check members" msgstr "" -"Введите значение тега, например: check " -"members" +"Введите значение тега, например: check members" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123 @@ -5399,5 +5566,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 @@ -5464,17 +5631,16 @@ #, 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 "" "Вы не закончили слияние изменений в этом конфликте.
Улаживание " "конфликтов не может быть применено до тех пор, пока все все конфликты не " "будут улажены.
Нажатие на '{0}', закроет диалог. " -" Однако
неулаженные конфликты при этом не будут " -"применены.
Если же нажать на {1}, то вы " -"вернётесь к улаживанию конфликтов." +" Однако
неулаженные конфликты при этом не будут применены.
Если же нажать на {1}, то вы вернётесь к " +"улаживанию конфликтов." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 @@ -5548,18 +5714,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 @@ -5569,13 +5735,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 "Показать историю выделенных объектов." @@ -5771,5 +5937,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 "Создать копию этого отношения и открыть его в другом окне редактора" @@ -5812,25 +5978,25 @@ 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." @@ -5839,5 +6005,5 @@ "панели." -#: ../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 "Щёлкните для уменьшения/увеличения содержимого панели" @@ -5902,5 +6068,5 @@ 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 "" @@ -5908,33 +6074,33 @@ "участник." -#: ../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 "" @@ -5944,17 +6110,18 @@ "Дочерний элемент
{0}
удален с сервера. Он не может быть загружен" -#: ../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 "Скачивание отношения {0}" -#: ../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}" @@ -5963,22 +6130,50 @@ "Исключение: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +#: ../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] "Скачивание отношения ''{0}'' с сервера" +msgstr[1] "Скачивание отношения ''{0}'' с сервера" +msgstr[2] "Скачивание отношения ''{0}'' с сервера" + +#: ../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 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "Скачивание отношения ''{0}'' с сервера" + +#: ../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:160 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 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?" +"relation itself.
This creates circular dependencies and is discouraged." +"
How do you want to proceed with circular dependencies?" msgstr "" "Имеется, по крайней мере, один участник отношения,
обращающийся к " @@ -5986,19 +6181,19 @@ "хотите продолжать с циклическими отношениями?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java: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?" +"primitive ''{0}''

Do you really want to add another relation member?" msgstr "" "В этом отношение уже есть один или более участник, относящихся " @@ -6006,9 +6201,9 @@ "участника отношения?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 +#: ../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 "" @@ -6021,5 +6216,5 @@ "''{0}'' будет пропущено." -#: ../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" @@ -6028,5 +6223,5 @@ "участником" -#: ../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" @@ -6035,5 +6230,5 @@ "участника" -#: ../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 " @@ -6043,5 +6238,5 @@ "выделенным участником" -#: ../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 " @@ -6051,22 +6246,20 @@ "выделенного участника" -#: ../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 "" -"Удалить всех участников, относящихся к каждому из выделенных элементов" +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 +msgstr "Выделить участников отношения, которые относятся к выбранным элементам" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 #, java-format msgid "" @@ -6077,61 +6270,65 @@ "выделенных элементов" -#: ../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:1056 +#: ../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" @@ -6140,5 +6337,5 @@ "отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6150,56 +6347,62 @@ "создать конфликт и закрыть редактор?" -#: ../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 "" -"В слое ''{0}'' уже есть конфликт для " -"элемента
''{1}''.
Пожалуйста, устраните этот конфликт, прежде чем " -"продолжать." - -#: ../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 "" +"В слое ''{0}'' уже есть конфликт для элемента
''{1}''." +"
Пожалуйста, устраните этот конфликт, прежде чем продолжать." + +#: ../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" -msgstr "Скачать недостающие части линий и точки, участвующие в отношении" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../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: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 +#, fuzzy +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 "" @@ -6209,44 +6412,37 @@ msgstr "" "Вы назначили пустую роль на {0} элем .
Это эквивалентно удалению " -"ролей из этих элементов.
Вы действительно хотите назначить новую " -"роль?" - -#: ../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 "Скачивание отношения ''{0}'' с сервера" - -#: ../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 "Масштабирование отменено, потому что вы не выбрали участника" @@ -6288,19 +6484,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 "Изменить новое отношение в слое ''{0}''" -#: ../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 "Изменить новое отношение в слое ''{0}''" -#: ../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}''" @@ -6312,6 +6508,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 "" "Предупреждение: исключение проигнорировано, потому что задача отмнена. " @@ -6350,6 +6545,6 @@ "maxlon): {0}, {1}, {2}, {3}" msgstr "" -"Текущая область для скачивания с сервера " -"(minlat,minlon, maxlat, maxlon): {0}, {1}, {2}, {3}" +"Текущая область для скачивания с сервера (minlat," +"minlon, maxlat, maxlon): {0}, {1}, {2}, {3}" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 @@ -6444,6 +6639,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:96 msgid "Select to download OSM data in the selected download area." -msgstr "" -"Пометьте, чтобы скачать с сервера данные OSM, для выделенной области." +msgstr "Пометьте, чтобы скачать с сервера данные OSM, для выделенной области." #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98 @@ -6505,11 +6699,10 @@ #, java-format msgid "" -"Neither {0} nor {1} is " -"enabled.
Please chose to either download OSM data, or GPX data, or " -"both." -msgstr "" -"Ни {0} ни {1} не " -"назначено.
Пожалуйста выберите, скачать только данные OSM с сервера, или " -"только данные GPX, или и то и другое." +"Neither {0} nor {1} is enabled." +"
Please chose to either download OSM data, or GPX data, or both." +msgstr "" +"Ни {0} ни {1} не назначено." +"
Пожалуйста выберите, скачать только данные OSM с сервера, или только " +"данные GPX, или и то и другое." #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80 @@ -7281,5 +7474,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 @@ -7520,6 +7713,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 "" "

Отсутствует содержимое справки в " @@ -7536,11 +7729,11 @@ "

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 "" "

Произошла ошибка при получении справочной " "информации

Невозможно загрузить содержимое " -"справочной статьи {0}. Сообщение об ошибке (не " -"переведено):
{1}

" +"справочной статьи {0}. Сообщение об ошибке (не переведено):" +"
{1}

" #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 @@ -7670,11 +7863,9 @@ msgid "" "Failed to set reference. Reference version {0} not available in history." -msgstr "" -"Не удалось настроить ссылку. Версия ссылки {0} отсутствует в истории." +msgstr "Не удалось настроить ссылку. Версия ссылки {0} отсутствует в истории." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 msgid "History not initialized yet. Failed to set current primitive." -msgstr "" -"История ещё не инициализирована. Не удалось настроить текущий элемент." +msgstr "История ещё не инициализирована. Не удалось настроить текущий элемент." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 @@ -7817,13 +8008,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}" @@ -7925,6 +8116,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 "" "В слое ''{0}'' есть изменения, которые должны быть загружены на сервер." @@ -8024,18 +8214,18 @@ 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] "" "{0} слой нужно сохранить, но нет соответствующего файла.
Либо " -"выберите файл для этого слоя, либо отмените изменения.
Слой без " -"файла:" +"выберите файл для этого слоя, либо отмените изменения.
Слой без файла:" msgstr[1] "" "{0} слоя нужно сохранить, но нет соответствующего файла.
Либо " -"выберите файл для каждого слоя, либо отмените изменения.
Слои без " -"файла:" +"выберите файл для каждого слоя, либо отмените изменения.
Слои без файла:" msgstr[2] "" "{0} слоёв нужно сохранить, но нет соответствующего файла.
Либо " -"выберите файл для каждого слоя, либо отмените изменения.
Слои без " -"файла:" +"выберите файл для каждого слоя, либо отмените изменения.
Слои без файла:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 @@ -8047,6 +8237,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 " @@ -8080,6 +8270,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Exit JOSM without saving. Unsaved changes are lost." -msgstr "" -"Выйти из JOSM без сохранения. Несохранённые изменения будут утеряны." +msgstr "Выйти из JOSM без сохранения. Несохранённые изменения будут утеряны." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 @@ -8115,5 +8304,5 @@ msgstr "Подготовка слоя ''{0}'' для загрузки на сервер..." -#: ../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 " @@ -8123,5 +8312,5 @@ "правками
было отменено или не удалось." -#: ../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 "Неполная загрузка на сервер или не всё сохранено" @@ -8194,41 +8383,41 @@ #: ../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:" @@ -8238,5 +8427,5 @@ msgstr[2] "Добавить {0} объектов:" -#: ../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:" @@ -8246,5 +8435,5 @@ msgstr[2] "{0} объектов изменить:" -#: ../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:" @@ -8254,13 +8443,13 @@ msgstr[2] "Удалить {0} объектов:" -#: ../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 "" @@ -8268,60 +8457,57 @@ "(мин. 3 символа)" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 msgid "Enter an upload comment (min. 3 characters)" msgstr "Введите комментарий для загрузки на сервер (мин. 3 символа)" -#: ../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}" @@ -8329,16 +8515,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}." @@ -8346,6 +8532,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 "" @@ -8356,5 +8542,5 @@ "сервер будет произведена без этого элемента." -#: ../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 "Подготовка элементов к загрузке на сервер ..." @@ -8388,112 +8574,58 @@ 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 "Начало GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "Конец GPS: {0}" - -#: ../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] "изображений" - -#: ../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 "Изображения JPEG (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "Невозможно прочесть дату из файла \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "EXIF файла \"{0}\" не содержит информации о времени." - -#: ../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 "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "Часовой пояс GPS объекта (отличается от фотографии)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Синхронизировать время с GPS приёмником" - -#: ../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 +#, fuzzy, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "Ошибка: не удается сохранить свойства для ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 +#, fuzzy +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 +#, fuzzy +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} метров" + +#: ../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 +#, fuzzy, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "Файл ''{0}'' не записывается. Пожалуйста, поменяйте имя файла." + +#: ../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 @@ -8501,30 +8633,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 @@ -8532,5 +8664,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 @@ -8539,5 +8671,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 @@ -8546,58 +8678,69 @@ 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 "Именованные точки трека из {0}" -#: ../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 "" +"Данные в слое GPX ''{0}'' были скачаны с сервера.
Так как путевые " +"точки не содержат меток времени, мы не можем синхронизировать их с " +"аудиоданными." + +#: ../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 +msgstr "Импорт невозможен" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248 msgid "Wave Audio files (*.wav)" msgstr "Аудиофайлы Wave (*.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 "" +"Данные в слое GPX ''{0}'' были скачаны с сервера.
Так как путевые " +"точки не содержат меток времени, мы не можем синхронизировать их с " +"изображениями." + +#: ../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 "Изображения JPEG (*.jpg)" + +#: ../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 @@ -8605,5 +8748,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" @@ -8614,5 +8757,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 @@ -8620,22 +8763,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 "URL" - -#: ../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, " @@ -8645,5 +8783,5 @@ msgstr[2] "{0} маршрутов, " -#: ../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" @@ -8653,24 +8791,24 @@ msgstr[2] "{0} путевых точек" -#: ../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:" +#: ../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 "" "Загрузка на сервер необработанных данных GPS под видом данных карты " "считается вредоносной.
Если хотите загрузить треки, ознакомьтесь с этим:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8680,29 +8818,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 "Скачать с OSM данные вдоль этого трека" -#: ../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 "" @@ -8713,9 +8851,9 @@ "Продолжить?" -#: ../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 "На слое отсутствует трек GPX, чтобы наложить звук." -#: ../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 " @@ -8725,5 +8863,5 @@ "будут пропущены или перенесены в начало трека." -#: ../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 " @@ -8733,24 +8871,24 @@ "проигнорированы при рассчете времени." -#: ../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 "версия {0}" -#: ../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 "" "Внимание: совместное использование данных версий 0.6 и 0.5 в версии 0.5" -#: ../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." @@ -8760,5 +8898,5 @@ msgstr[2] "Обнаружено {0} конфликтов." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 #, java-format msgid "" @@ -8782,5 +8920,5 @@ "удалёны на сервере." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 #, java-format msgid "" @@ -8800,11 +8938,11 @@ "конфликтов и устраните конфликты вручную." -#: ../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" @@ -8814,32 +8952,32 @@ msgstr[2] "{0} удалено" -#: ../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 "Версия API: {0}" -#: ../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 "Преобразовать в слой GPX" -#: ../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:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 msgid "No problems found" msgstr "Проблемы не обнаружены" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 msgid "Following problems found:" msgstr "Обнаружены следующие проблемы:" @@ -8847,10 +8985,10 @@ #: ../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 "" "Загрузка на сервер необработанных данных GPS под видом данных карты " -"считается вредоносной.
Если хотите загрузить треки, ознакомьтесь с " -"этим:" +"считается вредоносной.
Если хотите загрузить треки, ознакомьтесь с этим:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 @@ -8893,4 +9031,361 @@ msgstr[2] "{0} точек" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "Файлы GPX (*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "Файл {0} загружен под именем \"{1}\"" + +#: ../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 "" +" Сделайте фото вашего GPS приемника, когда он показывает время.
" +"Покажите это фото здесь.
И потом, просто захват время которое вы " +"прочитаете на фото и выберите часовой пояс
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Время фотоснимка (из EXIF):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "Время GPS (прочтите на фото вверху): " + +#: ../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 "Синхронизация времени с фотографией GPS-приемника" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"Ошибка при разборе даты.\n" +"Пожалуйста, используйте запрашиваемый формат" + +#: ../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 "<Не загружены треки GPX>" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +msgid "GPX track: " +msgstr "Трек GPX: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Открыть другой трек GPX" + +#: ../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 "" +"Я могу сфотографировать экран GPS приёмника.
Это поможет?" + +#: ../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 "Изображения без координат в заголовках Exif" + +#: ../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 "Сопоставить изображения с GPX треком" + +#: ../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 "Необходимо выбрать трек GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "Трек GPX не выделен" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Ошибка при разборе часового пояса.\n" +"Ожидаемый формат: {0}" + +#: ../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 "" +"Ошибка при разборе смещения.\n" +"Ожидаемый формат: {0}" + +#: ../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 "Надено {0} совпадений из {1} в GPX треке {2}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "Трек GPX загружен" + +#: ../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 "" +"Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "GPX трек не содержит информации о времени" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "Часовой пояс: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "Минуты: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "Секунды: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Совпавшие {0} из {1} фотографий с GPX треком." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "(Разница во времени {0} дней)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "Смещение между треком и фотографией: {0}м {1}с" + +#: ../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 "" +"Произошла ошибка во время попытки сопоставить фотографии с GPX треком. Вы " +"можете вручную сопоставить фотографии использую ползунки." + +#: ../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 "Извлечение GPS координат из EXIF" + +#: ../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 "Не удалось получить канонический путь к каталогу {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "Скнирование каталога {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "Найден пустой файл в каталоге {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Ошибка чтения файлов в каталоге {0}\n" + +#: ../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 "Коррелируют с GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "изображение" +msgstr[1] "изображения" +msgstr[2] "изображений" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "{0} изображений имело теги GPS" + +#: ../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 "Загрузка {0}" + +#: ../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 "Ошибка в файле {0}" + +#: ../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 "Масштабировать с лучшим расположением и 1:1" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#, java-format +msgid "" +"\n" +"Altitude: {0} m" +msgstr "" +"\n" +"Высота: {0} м" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} км/ч" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -9064,6 +9559,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40 msgid "Explicit waypoints with time estimated from track position." -msgstr "" -"Точные маршрутные точки с приблизительным временем из позиции на треке" +msgstr "Точные маршрутные точки с приблизительным временем из позиции на треке" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41 @@ -9081,6 +9575,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53 msgid "Show or hide the audio menu entry on the main menu bar." -msgstr "" -"Отобразить или спрятать меню работы со звуком на панели Главного меню" +msgstr "Отобразить или спрятать меню работы со звуком на панели Главного меню" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58 @@ -9217,5 +9710,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 @@ -9417,6 +9910,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 "" "Отображать стрелки направления, используя таблицы, вместо математических " @@ -9428,6 +9920,5 @@ "Don't draw arrows if they are not at least this distance away from the last " "one." -msgstr "" -"Не отображать стрелки, если они находятся близко от предыдущих стрелок" +msgstr "Не отображать стрелки, если они находятся близко от предыдущих стрелок" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144 @@ -9482,6 +9973,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 "Применить сглаживание карты." @@ -9551,19 +10041,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 @@ -9822,9 +10312,9 @@ #, java-format msgid "" -"Failed to load the list of style sources " -"from
''{0}''.

Details (untranslated):
{1}" -msgstr "" -"Не удалось загрузить список источников стилей " -"из
''{0}''.

Подробности (на англ.):
{1}" +"Failed to load the list of style sources from
''{0}''." +"

Details (untranslated):
{1}" +msgstr "" +"Не удалось загрузить список источников стилей из
''{0}''." +"

Подробности (на англ.):
{1}" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 @@ -9890,6 +10380,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 "" "

Кроме того, горячие клавиши активируются, если назначаются для какого-" @@ -9906,9 +10396,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 "" "

Вы можете заметить, что в списке выбора клавиш на следующей вкладке есть " @@ -9948,6 +10437,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 "

Псевдо-модификатор 'отключено' отключает горячую клавишу.

" @@ -10041,5 +10530,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 "Подробнее" @@ -10127,5 +10616,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 @@ -10133,5 +10622,5 @@ msgstr "Сервер сообщил о неудавшемся разборе даты ''{0}''." -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -10255,16 +10744,15 @@ msgstr "Неизвестный режим {0}." -#: ../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." +#: ../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 "" "Нет элемента с id {0} в локальном наборе данных. Невозможно вывести тип " "элемента." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../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 @@ -10292,20 +10780,20 @@ msgstr "Сервер выдал ошибку 404 для id {0}. Пропускаем" -#: ../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 "Выборка пакета точек из ''{0}''" -#: ../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 "Выборка пакета линий из ''{0}''" -#: ../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 "Выборка пакета отношений из ''{0}''" -#: ../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 " @@ -10314,4 +10802,12 @@ "Сервер выдал ошибку 404, повторная попытка будет с индивидуальным запросом " "для каждого элемента" + +#: ../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}'' с сервера" +msgstr[1] "Скачивание отношения ''{0}'' с сервера" +msgstr[2] "Скачивание отношения ''{0}'' с сервера" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10353,98 +10849,98 @@ msgstr "отсутствует пункт настройки \"{0}\". Не могу инициализировать OsmApi" -#: ../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 "Эта версия JOSM несовместима с настроенным сервером." -#: ../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}." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#, fuzzy, java-format +msgid "" +"It supports protocol version 0.6, while the server says it supports {0} to " +"{1}." msgstr "" "Поддерживает протокол версии 0.5 и 0.6, тогда как сервер сообщает о " "поддержке {0} до {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Соединение с {0} установлено используя протокол {1}" -#: ../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 "сервер вернул неожиданный формат id, текущее значение \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 #, java-format msgid "" "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''." msgstr "" -"Неожиданный формат новой версии изменённого элемента \"{0}\". Получено " -"\"{1}\"" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 +"Неожиданный формат новой версии изменённого элемента \"{0}\". Получено \"{1}" +"\"" + +#: ../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 "Успешно открытый пакет правок {0}" -#: ../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 "Обновление пакета правок {0}..." -#: ../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 "Ожидание 10 секунд ... " -#: ../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 "Попытка {0} из {1} через {2} секунды..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 msgid "OK - trying again." msgstr "OK - пробуем ещё раз." -#: ../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 "Попытка {0} из {1}." -#: ../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 "Требуется, чтобы ID текущего пакета правок был > 0. Текущий ID: {0}." -#: ../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}." @@ -10481,5 +10977,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}''." @@ -10506,5 +11002,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}." @@ -10512,5 +11008,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}" @@ -10520,9 +11016,8 @@ #, java-format msgid "Undefined element ''{0}'' found in input stream. Aborting." -msgstr "" -"Неопределённый элемент ''{0}'' обнаружен во входящем потоке. Отменено." +msgstr "Неопределённый элемент ''{0}'' обнаружен во входящем потоке. Отменено." #: ../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}''." @@ -10564,6 +11059,5 @@ msgid "" "Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль." +msgstr "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль." #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 @@ -10581,11 +11075,11 @@ #: ../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." -msgstr "" -"ВНИМАНИЕ: Пароль хранится открытым текстом, в файле " -"настроек.
Пароль передаётся на сервер открытым текстом, закодированный в " -"URL.
Не используйте важные Пароли.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 "" +"ВНИМАНИЕ: Пароль хранится открытым текстом, в файле настроек." +"
Пароль передаётся на сервер открытым текстом, закодированный в URL." +"
Не используйте важные Пароли.An error occurred while restoring backup file.
Error " -"is:
{0}" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "" "Произошла ошибка при восстановлении резервной копии файла.
Ошибка: " @@ -10688,28 +11182,28 @@ msgstr "Файл \"{0}\" не существует" -#: ../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}''." +#: ../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 "" "Отсутствуют обязательные атрибуты элемента ''bounds'' (границы). Получено " "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Found XML element not as direct child of element ." msgstr "Найден элемент XML , не являющийся дочерним элементом для ." -#: ../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 "Отсутствует обязательный атрибут ''{0}'' на линии {1}." -#: ../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 "Неверное значение атрибута ''ref'' элемента . Получено {0}." -#: ../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 "" @@ -10717,22 +11211,21 @@ "." -#: ../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 "Отсутствует атрибут ''ref'' у участника отношений {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 -#, java-format -msgid "" -"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" +#: ../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 "" "Неверное значение атрибута ''ref'' у участника отношения {0}. Получено {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Отсутствует атрибут ''type'' у участника {0} отношения {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 #, java-format msgid "" @@ -10742,9 +11235,9 @@ "{2}." -#: ../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 "Неполная спецификация с ref=0" -#: ../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." @@ -10752,10 +11245,10 @@ "Неопределённый элемент ''{0}'' обнаружен во входящем потоке. Пропущено." -#: ../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 "" @@ -10767,8 +11260,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 "" @@ -10780,25 +11273,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 "Неизвестная или неподдерживаемая версия API. Получено {0}." -#: ../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 "Отсутствует атрибут ''version'' на элементе OSM с ID {0}." -#: ../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 "Отсутствует нужный атрибут ''{0}''." -#: ../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 "Неверная длина значения атрибута ''{0}''. Получено ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 #, java-format msgid "" @@ -10807,5 +11300,5 @@ "Линия с внешним ID ''{0}'' содержит отсутствующую точку с внешним ID ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10816,5 +11309,5 @@ "мере одна точка отсутствовала в скачанных данных." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10823,5 +11316,5 @@ "Неизвестный тип участника отношения ''{0}'' в отношении с внешним id ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10832,13 +11325,13 @@ "внешним id ''{1}''." -#: ../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 "Разбор данных OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 msgid "Preparing data set..." msgstr "Подготовка набора данных..." @@ -10891,4 +11384,10 @@ msgid "Contacting Server..." msgstr "Соединение с сервером..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 +#, fuzzy, java-format +msgid "Expected value > 0 for parameter ''{0}'', got {1}" +msgstr "недопустимое значение параметра \"index\". Текущее значение {0}" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10927,12 +11426,11 @@ #, java-format msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}." -msgstr "" -"Неверное значение атрибута ''{0}'' на теге XML ''{1}''. Получено {2}." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 +msgstr "Неверное значение атрибута ''{0}'' на теге XML ''{1}''. Получено {2}." + +#: ../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})" @@ -10940,5 +11438,5 @@ "{0}% ({1}/{2}), {3} осталось. Загрузка на сервер точки ''{4}'' (id: {5})" -#: ../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})" @@ -10946,34 +11444,31 @@ "{0}% ({1}/{2}), {3} осталось. Загрузка на сервер линии ''{4}'' (id: {5})" -#: ../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 "{0}% ({1}/{2}), {3} осталось. Загрузка отношения ''{4}'' (id: {5})" -#: ../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 +#, fuzzy, java-format +msgid "Value >0 expected for parameter ''{0}'', got {1}" +msgstr "недопустимое значение параметра \"index\". Текущее значение {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 +#, fuzzy +msgid "Starting to upload in chunks..." +msgstr "Начало загрузки на сервер за один запрос..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#, fuzzy, java-format +msgid "({0}/{1}) Uploading {2} objects..." +msgstr "Передача объектов на сервер. Кол-во: {0}..." + +#: ../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 "" -"Предупреждение: нет версии API предназначенной для загрузки данных на " -"сервер. Возврат к версии 0.6" - -#: ../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 "" -"ПРЕДУПРЕЖДЕНИЕ: параметр ''{0}'' или версия API ''{1}'' набора данных " -"требует загрузку на сервер изменений, но API не способна выполнить это. " -"Загрузка изменений на сервер будет проигнорирована." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -11015,17 +11510,27 @@ msgstr "Скачивание модуля {0}..." -#: ../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 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Ошибка при скачивании модуля: {0}" + +#: ../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}." @@ -11037,16 +11542,15 @@ msgstr "В модуле {0} произошла ошибка" -#: ../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 "Был запрос на загрузку модуля {0}. Этот модуль бульше не нужен." - -#: ../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?" +"developed and very likely will produce errors.
It should be disabled." +"
Delete from preferences?" msgstr "" "Была запрошена загрузка модуля {0}.
Этот модуль больше не " @@ -11054,5 +11558,5 @@ "отключён.
Удалить из настроек?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 msgid "" "You updated your JOSM software.\n" @@ -11064,50 +11568,50 @@ "Обносить модули сейчас?" -#: ../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 "Последнее обновление модуля было более {0} дней назад" -#: ../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 "Модуль {0} требует обновить JOSM до версии {1}." -#: ../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 "Модуль {0} требуется модулю {1}, но не найден." -#: ../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 "Модуль не найден: {0}." -#: ../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 "Невозможно загрузить модуль {0}. Удалить из настроек?" -#: ../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 " @@ -11117,9 +11621,9 @@ "разрешение переписывать существующие модули." -#: ../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 "" @@ -11127,10 +11631,10 @@ msgstr "Произошла неожиданная ошибка. Возможно, она вызвана модулем ''{0}''." -#: ../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 "Согласно информации в модуле, автором является {0}." -#: ../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." @@ -11139,9 +11643,9 @@ "ошибке." -#: ../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 " @@ -11151,13 +11655,13 @@ "модуль." -#: ../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" @@ -11266,4 +11770,6 @@ "sure you've updated to the latest version of JOSM here:

" msgstr "" +"

Произошла ошибка при работе с JOSM. Прежде чем сообщить о ней, " +"
убедитесь, что вы работаете с последней версией JOSM здесь:

" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:96 @@ -11272,4 +11778,6 @@ "please
file a bug in our bugtracker using this link:

" msgstr "" +"Необходимо также обновить модули. Если все вышеперечисленное не " +"помогло,
сообщите нам об ошибке, перейдя по ссылке:

" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:99 @@ -11277,7 +11785,10 @@ "

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.

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

" +msgstr "" +"

Информация об ошибке уже добавлена ниже
для облегчения работы. " +"Вы только опишите подробно, то, как возникла эта
ошибка и постарайтесь " +"сделать это поподробнее.

" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:103 @@ -11286,4 +11797,6 @@ "information
below at this URL:

" msgstr "" +"

В качестве альтернативы, если это не работает, вы можете вручную " +"заполнить
по этой ссылке:

" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:111 @@ -11293,5 +11806,5 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:120 msgid "You've encountered a bug in JOSM" -msgstr "" +msgstr "Произошла ошибка при работе в JOSM" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 @@ -11319,10 +11832,10 @@ 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 "" "Загрузка на сервер не удалась, так как ваши " -"данные
противоречат обязательным условиям.
Сообщение об ошибке: " -"
{0}" +"данные
противоречат обязательным условиям.
Сообщение об ошибке:
" +"{0}" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 @@ -11383,7 +11896,6 @@ "check your internet connection." msgstr "" -"Невозможно установить соединение с удаленным " -"сервером
''{0}''.
Пожалуйста проверьте свое подключение к " -"интернету." +"Невозможно установить соединение с удаленным сервером
''{0}''." +"
Пожалуйста проверьте свое подключение к интернету." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 @@ -11399,7 +11911,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 "" "Сервер OSM
''{0}''
сообщил о внутренней ошибке.
Похоже, это " @@ -11413,7 +11924,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 "" "Область, которую вы хотите скачать слишком велика или запрошено слишком " @@ -11455,24 +11966,24 @@ "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 "" "Сервер сообщил, что объект удалён.
Передача на сервер не " "удалась, если вы пытались обновить или удалить этот объект.
" -"Скачка не удалась, если вы пытались скачать этот " -"объект.

Сообщение об ошибке:
{0}" +"Скачка не удалась, если вы пытались скачать этот объект." +"

Сообщение об ошибке:
{0}" #: ../core/src/org/openstreetmap/josm/tools/I18n.java:98 msgid "Loading available locales..." -msgstr "" +msgstr "Загрузка доступных языков..." #: ../core/src/org/openstreetmap/josm/tools/I18n.java:102 msgid "Checking locales..." -msgstr "" +msgstr "Проверка языков..." #: ../core/src/org/openstreetmap/josm/tools/I18n.java:105 #, java-format msgid "Checking translation for locale ''{0}''" -msgstr "" +msgstr "Проверка перевода для языка ''{0}''" #: ../core/src/org/openstreetmap/josm/tools/I18n.java:171 @@ -11741,5 +12252,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" @@ -11754,12 +12265,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 @@ -11767,93 +12276,133 @@ 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 "Отношение: {0}" -#: ../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 "Будет присоединено {0} дополнительных точек номеров домов" -#: ../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 +#, fuzzy +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 "Код страны должен состоять из 2 букв" -#: ../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 "" @@ -11861,368 +12410,15 @@ "к началу алфавита, чем буква номера дома, находящегося в конце улицы" -#: ../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 "AgPifoJ - Изображения с геотегами" - -#: ../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 "Масштабировать с лучшим расположением и 1:1" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 -#, java-format -msgid "" -"\n" -"Altitude: {0} m" -msgstr "" -"\n" -"Высота: {0} м" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} км/ч" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "Извлечение GPS координат из EXIF" - -#: ../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 "Не удалось получить канонический путь к каталогу {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "Скнирование каталога {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "Найден пустой файл в каталоге {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Ошибка чтения файлов в каталоге {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "Коррелируют с GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} изображений имело теги GPS" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "Открыть изображения через AgPifoJ..." - -#: ../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 "Файлы GPX (*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "Файл {0} загружен под именем \"{1}\"" - -#: ../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 "" -" Сделайте фото вашего GPS приемника, когда он показывает время.
" -"Покажите это фото здесь.
И потом, просто захват время которое вы " -"прочитаете на фото и выберите часовой пояс
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Время фотоснимка (из EXIF):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "Время GPS (прочтите на фото вверху): " - -#: ../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 "Синхронизация времени с фотографией GPS-приемника" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"Ошибка при разборе даты.\n" -"Пожалуйста, используйте запрашиваемый формат" - -#: ../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 "<Не загружены треки GPX>" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 -msgid "GPX track: " -msgstr "Трек GPX: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Открыть другой трек GPX" - -#: ../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 "" -"Я могу сфотографировать экран GPS приёмника.
Это поможет?" - -#: ../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 "Изображения без координат в заголовках Exif" - -#: ../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 "Сопоставить изображения с GPX треком" - -#: ../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 "Необходимо выбрать трек GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Трек GPX не выделен" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Ошибка при разборе часового пояса.\n" -"Ожидаемый формат: {0}" - -#: ../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 "" -"Ошибка при разборе смещения.\n" -"Ожидаемый формат: {0}" - -#: ../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 "Надено {0} совпадений из {1} в GPX треке {2}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "Трек GPX загружен" - -#: ../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 "" -"Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX трек не содержит информации о времени" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Часовой пояс: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Минуты: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Секунды: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Совпавшие {0} из {1} фотографий с GPX треком." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Разница во времени {0} дней)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Смещение между треком и фотографией: {0}м {1}с" - -#: ../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 "" -"Произошла ошибка во время попытки сопоставить фотографии с GPX треком. Вы " -"можете вручную сопоставить фотографии использую ползунки." - -#: ../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 "Загрузка {0}" - -#: ../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 "Ошибка в файле {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -12250,4 +12446,6 @@ "Probably an old version of the cache file." msgstr "" +"Ошибка загрузки файла.\n" +"Возможно в кэше старая версия файла." #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 @@ -12376,18 +12574,17 @@ #: ../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 "" "Особый обработчик французского кадастра WMS на www.cadastre.gouv.fr
" "
Пожалуйста, прочитайте условия использования здесь (по-французски): " -"
" -"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " -"
до загрузки на сервер каких-либо данных, созданный этим модулем." +"
http://www.cadastre.gouv.fr/scpc/html/" +"CU_01_ConditionsGenerales_fr.html
до загрузки на сервер каких-либо " +"данных, созданный этим модулем." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 @@ -12462,6 +12659,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Oldest files are automatically deleted when this size is exceeded" -msgstr "" -"Более старые файлы автоматически удаляются, когда этот размер превышен" +msgstr "Более старые файлы автоматически удаляются, когда этот размер превышен" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80 @@ -12719,13 +12915,4 @@ msgstr "Экспортировать в формате PNG (только растровые изображения)" -#: ../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] "Упростить линию (удалить {0} точку)" -msgstr[1] "Упростить линию (удалить {0} точки)" -msgstr[2] "Упростить линию (удалить {0} точек)" - #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 @@ -12843,14 +13030,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:41 +#: ../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:39 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 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 " @@ -13063,6 +13250,6 @@ msgstr "" "Не удается загрузить библиотеку rxtxSerial. Если вам нужна консультация по " -"установке, получите её на главной странице GlobalSat http://www.raphael-" -"mack.de/josm-globalsat-gpx-import-plugin/" +"установке, получите её на главной странице GlobalSat http://www.raphael-mack." +"de/josm-globalsat-gpx-import-plugin/" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 @@ -13164,4 +13351,8 @@ msgstr "Открыть изображения в ImageWayPoint" +#: ../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" @@ -13205,18 +13396,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 "Аппроксимация Douglas-Peucker..." -#: ../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" @@ -13265,7 +13456,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -13275,5 +13466,5 @@ #. 50000 #. -#. +#. #. #. @@ -13283,5 +13474,5 @@ #. 50000 #. -#. +#. #. #. @@ -13290,5 +13481,5 @@ #. 50000 #. -#. +#. #. #. @@ -13298,5 +13489,5 @@ #. 50000 #. -#. +#. #. #. @@ -13374,6 +13565,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 "" "Максимальное количество сегментов в создаваемых линиях. По умолчанию - 250." @@ -13397,11 +13587,10 @@ #: ../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." -msgstr "" -"Точность алгоритма упрощения линий Douglas-Peucker, измеряемая в " -"градусах.
Меньшие значения дают больше точек, большие — более точные " -"линии. По умолчанию 0.0003." +"Accuracy of Douglas-Peucker line simplification, measured in degrees." +"
Lower values give more nodes, and more accurate lines. Default 0.0003." +msgstr "" +"Точность алгоритма упрощения линий Douglas-Peucker, измеряемая в градусах." +"
Меньшие значения дают больше точек, большие — более точные линии. По " +"умолчанию 0.0003." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 @@ -13469,20 +13658,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 "Ошибка при подключении" @@ -13707,6 +13895,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 "" "Заголовок содержит несколько значений, и не может быть представлен одной " @@ -13792,9 +13979,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 "Osmarender" -#: ../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 " @@ -13804,9 +13992,5 @@ "Настройки карты в окне настроек." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "Настройки osm рендера" - -#: ../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 "исполняемый файл Firefox" @@ -14191,17 +14375,17 @@ "В первую очередь Вы должны указать в настройках источники заготовок тегов." -#: ../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 "Обратный ряд домов вдоль улицы" @@ -14245,172 +14429,4 @@ msgid "Optional" 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 "\"{0}\" не замкнут, и поэтому они не могут быть объединены." - -#: ../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 "" -"Выделенные линии содержат точки, находящиеся за пределами\n" -"скачанной области. Некоторые точки могут быть случайно\n" -"удалены. Вы действительно хотите продолжить?" - -#: ../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 "Введите Lat / Lon, чтобы перейти к позиции." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 -msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "Вы также можете вставить URL из www.openstreetmap.org" - -#: ../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] "Выделена {0} линия. Вы уверены, что хотите упростить её?" -msgstr[1] "Выделено {0} линии. Вы уверены, что хотите упростить их все?" -msgstr[2] "Выделено {0} линий. Вы уверены, что хотите упростить их все?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "Вы уверены?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14510,5 +14526,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}" @@ -14561,34 +14577,34 @@ msgstr "Игнорировать выделенные ошибки в будущем." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../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:197 +#: ../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:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Ничего" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Игнорировать всю группу, или отдельные элементы?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 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 "Исправление ({0}/{1}): ''{2}''" -#: ../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 "Обновление карты ..." @@ -14640,18 +14656,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 "Подтверждение" @@ -14726,6 +14742,5 @@ "This test checks that a connection between two nodes is not used by more " "than one way." -msgstr "" -"Этот тест проверяет, чтобы две точки соединялись только одной линией." +msgstr "Этот тест проверяет, чтобы две точки соединялись только одной линией." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107 @@ -14878,6 +14893,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:608 msgid "Validate property values and tags using complex rules." -msgstr "" -"Проверка корректности значений и тегов, использующих сложные правила." +msgstr "Проверка корректности значений и тегов, использующих сложные правила." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:629 @@ -14891,11 +14905,9 @@ #: ../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." -msgstr "" -"Источники (URL или имя файла) проверки правописания (см. " -"http://wiki.openstreetmap.org/index.php/User:JLS/speller) или тег проверки " -"файлов данных." +"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." +"org/index.php/User:JLS/speller) or tag checking data files." +msgstr "" +"Источники (URL или имя файла) проверки правописания (см. http://wiki." +"openstreetmap.org/index.php/User:JLS/speller) или тег проверки файлов данных." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 @@ -15042,5 +15054,5 @@ #. 50000 #. -#. +#. #. #. @@ -15048,5 +15060,5 @@ #. #. -#. +#. #. #. @@ -15056,5 +15068,5 @@ #. 50000 #. -#. +#. #. #. @@ -15063,5 +15075,5 @@ #. 50000 #. -#. +#. #. #. @@ -15070,5 +15082,5 @@ #. 50000 #. -#. +#. #. #. @@ -15077,5 +15089,5 @@ #. 50000 #. -#. +#. #. #. @@ -15084,5 +15096,5 @@ #. 50000 #. -#. +#. #. #. @@ -15091,9 +15103,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -15138,5 +15150,5 @@ #. 50000 #. -#. +#. #. #. @@ -15182,6 +15194,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38 msgid "This test checks for untagged nodes that are not part of any way." -msgstr "" -"Этот тест ищет точки, не имеющие тегов, и не являющиеся частью линий." +msgstr "Этот тест ищет точки, не имеющие тегов, и не являющиеся частью линий." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59 @@ -15276,14 +15287,14 @@ msgstr "Walking Papers" -#: ../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 " @@ -15295,15 +15306,15 @@ "любую точку, лежащую на такой линии." -#: ../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 "Нет линий, присоединённых к точке ''{0}''. Отменено." -#: ../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 "" @@ -15314,5 +15325,5 @@ "не была обнаружена после скачивания с сервера" -#: ../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 "" @@ -15324,18 +15335,17 @@ msgstr "" "Нет больше присоединённых линий для загрузки с сервера.
Однако был " -"найден возможный дубликат выделенной точки.

Выделена точка: " -"''{0}''.
А возможный её дубликат: ''{1}''
Произвести слияние " -"выделенной точки с дубликатом и продолжить скачивание линии с сервера?" - -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 +"найден возможный дубликат выделенной точки.

Выделена точка: ''{0}''." +"
А возможный её дубликат: ''{1}''
Произвести слияние выделенной точки " +"с дубликатом и продолжить скачивание линии с сервера?" + +#: ../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 +msgstr "Нет больше присоединённых линий для скачивания с сервера." + +#: ../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." @@ -15507,37 +15517,37 @@ "измените разрешение" -#: ../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 "Сохранить слой WMS в файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "Сохраниеть WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "Загрузить слой WMS из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "Загрузить WMS слой" -#: ../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}" @@ -15545,13 +15555,13 @@ "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}" -#: ../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 "Установить закладку WMS" @@ -15627,5 +15637,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 "" @@ -15669,24 +15679,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 "" -"Модуль геотега для JOSM. Совмещает фотографии с GPS треками или импортирует " -"геотеги из EXIF фотографий." - -#. Plugin cadastre-fr -#: build/trans_plugins.java:7 msgid "A special handler for the French land registry WMS server." msgstr "Особый обработчик на WMS-сервере французского земельного кадастра." #. Plugin colorscheme -#: build/trans_plugins.java:9 +#: build/trans_plugins.java:7 msgid "" "Allows the user to create different color schemes and to switch between " @@ -15699,27 +15701,27 @@ "между ними. Просто измените цвет и создайте новую схему. Используется для " "переключения на белый фон с соответствующими цветами для большей наглядности " -"при ярком солнечном свете. См. окно настроек JOSM и \"Настройки Карты\" " -"(странно, но это так :-)" +"при ярком солнечном свете. См. окно настроек JOSM и \"Настройки Карты" +"\" (странно, но это так :-)" #. Plugin Create_grid_of_ways -#: build/trans_plugins.java:11 +#: build/trans_plugins.java:9 msgid "Create a grid of ways." msgstr "Создать сетку из линий." #. Plugin czechaddress +#: build/trans_plugins.java:11 +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 "" +"Позволяет импортировать файлы различных форматов непосредственно в JOSM" + +#. Plugin DirectUpload #: build/trans_plugins.java:15 -msgid "Allows to import various file formats into JOSM directly." -msgstr "" -"Позволяет импортировать файлы различных форматов непосредственно в JOSM" - -#. Plugin DirectUpload -#: build/trans_plugins.java:17 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " @@ -15730,10 +15732,10 @@ #. Plugin Duplicate-Way -#: build/trans_plugins.java:19 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "Дублирует линии с помощью смещения" #. Plugin editgpx -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -15744,7 +15746,6 @@ #. Plugin globalsat -#: build/trans_plugins.java:23 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" "Принять GPS данные со спутника GlobalSat dg100 Data Logger непосредственно в " @@ -15752,15 +15753,15 @@ #. Plugin graphview -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:23 msgid "Visualizes routing information as a routing graph." msgstr "Показывает информацию о маршруте в виде графа." #. Plugin grid -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Предоставлен фоновый слой который отображает сетку на карте" #. Plugin ImageWayPoint -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -15773,17 +15774,17 @@ #. Plugin lakewalker -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Помогает векторизовать изображения WMS." #. Plugin livegps +#: build/trans_plugins.java:31 +msgid "" +"Support live GPS input (moving dot) through a connection to gpsd server." +msgstr "" +"Поддержка GPS ввода (движение точки) с помощью подключения к серверу gpsd." + +#. Plugin measurement #: build/trans_plugins.java:33 -msgid "" -"Support live GPS input (moving dot) through a connection to gpsd server." -msgstr "" -"Поддержка GPS ввода (движение точки) с помощью подключения к серверу gpsd." - -#. Plugin measurement -#: build/trans_plugins.java:35 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -15796,10 +15797,10 @@ #. Plugin michigan_left -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:35 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "Добавляет запрет поворота налево для наборов из 4 или 5 линий" #. Plugin multipoly -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:37 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -15810,5 +15811,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 " @@ -15821,15 +15822,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:41 msgid "Displays an OpenLayers background image" msgstr "Отобразить фоновый рисунок OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:43 msgid "Imports issues from OpenStreetBugs" msgstr "Импорт вопросов из OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:45 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -15839,5 +15840,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:47 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -15845,5 +15846,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:49 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -15854,15 +15855,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:51 msgid "The great JGoodies Plastic Look and Feel." msgstr "Великолепный JGoodies Пластиковый Скин." #. Plugin remotecontrol -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:53 msgid "Let other applications send commands to JOSM." msgstr "Разрешить другим приложениям посылать команды JOSM." #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15873,10 +15874,10 @@ #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:57 msgid "Provides routing capabilities." msgstr "Предоставляет возможности маршрутизации." #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:59 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -15887,15 +15888,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:61 msgid "Allow adding markers/nodes on current gps positions." msgstr "Разрешить добавить метки/точки в текущей GPS позиции." #. Plugin tageditor -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:63 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Показывает окно для редактирования тегов в табличной сетке." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:65 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -15908,19 +15909,10 @@ #. Plugin terracer -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:67 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 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -15932,19 +15924,19 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " "plugin is still under early development and may be buggy." msgstr "" -"Поддерживает скачивание сканированных карт по квадратам, из walking-" -"papers.org. Этот модуль пока еще совершенствуется и может плохо работать." +"Поддерживает скачивание сканированных карт по квадратам, из walking-papers." +"org. Этот модуль пока еще совершенствуется и может плохо работать." #. 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, ...)." @@ -16999,8 +16991,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -17197,5 +17189,5 @@ #. color motorroad #. -#. +#. #. #. @@ -17205,5 +17197,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17222,5 +17214,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17230,5 +17222,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17247,5 +17239,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17255,5 +17247,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17272,5 +17264,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17280,5 +17272,5 @@ #. 300000 #. -#. +#. #. #. @@ -17293,5 +17285,5 @@ #. 300000 #. -#. +#. #. #. @@ -17309,5 +17301,5 @@ #. 50000 #. -#. +#. #. #. @@ -17325,5 +17317,5 @@ #. 40000 #. -#. +#. #. #. @@ -17332,5 +17324,5 @@ #. 40000 #. -#. +#. #. #. @@ -17340,5 +17332,5 @@ #. 50000 #. -#. +#. #. #. @@ -17358,5 +17350,5 @@ #. 50000 #. -#. +#. #. #. @@ -17365,5 +17357,5 @@ #. 50000 #. -#. +#. #. #. @@ -17373,5 +17365,5 @@ #. 50000 #. -#. +#. #. #. @@ -17421,7 +17413,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -18120,5 +18112,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -18157,5 +18149,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -18251,5 +18243,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -18406,5 +18398,5 @@ #. 50000 #. -#. +#. #. #. @@ -19792,5 +19784,5 @@ #. 30000 #. -#. +#. #. #. @@ -19800,5 +19792,5 @@ #. 40000 #. -#. +#. #. #. @@ -19808,5 +19800,5 @@ #. 20000 #. -#. +#. #. #. @@ -19816,5 +19808,5 @@ #. 40000 #. -#. +#. #. #. @@ -20172,7 +20164,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -20182,5 +20174,5 @@ #. 50000 #. -#. +#. #. #. @@ -20190,5 +20182,5 @@ #. 50000 #. -#. +#. #. #. @@ -20198,5 +20190,5 @@ #. 50000 #. -#. +#. #. #. @@ -20206,5 +20198,5 @@ #. 50000 #. -#. +#. #. #. @@ -20214,5 +20206,5 @@ #. 50000 #. -#. +#. #. #. @@ -20222,5 +20214,5 @@ #. 50000 #. -#. +#. #. #. @@ -20230,5 +20222,5 @@ #. 50000 #. -#. +#. #. #. @@ -20238,5 +20230,5 @@ #. 50000 #. -#. +#. #. #. @@ -20246,5 +20238,5 @@ #. 50000 #. -#. +#. #. #. @@ -20254,5 +20246,5 @@ #. 50000 #. -#. +#. #. #. @@ -20262,5 +20254,5 @@ #. 50000 #. -#. +#. #. #. @@ -20270,5 +20262,5 @@ #. 50000 #. -#. +#. #. #. @@ -20278,5 +20270,5 @@ #. 50000 #. -#. +#. #. #. @@ -20286,5 +20278,5 @@ #. 50000 #. -#. +#. #. #. @@ -20294,5 +20286,5 @@ #. 50000 #. -#. +#. #. #. @@ -20302,5 +20294,5 @@ #. 50000 #. -#. +#. #. #. @@ -20310,5 +20302,5 @@ #. 50000 #. -#. +#. #. #. @@ -20318,5 +20310,5 @@ #. 50000 #. -#. +#. #. #. @@ -20326,5 +20318,5 @@ #. 50000 #. -#. +#. #. #. @@ -20334,5 +20326,5 @@ #. 50000 #. -#. +#. #. #. @@ -20342,5 +20334,5 @@ #. 50000 #. -#. +#. #. #. @@ -20350,5 +20342,5 @@ #. 50000 #. -#. +#. #. #. @@ -20358,5 +20350,5 @@ #. 50000 #. -#. +#. #. #. @@ -20366,5 +20358,5 @@ #. 50000 #. -#. +#. #. #. @@ -20374,5 +20366,5 @@ #. 50000 #. -#. +#. #. #. @@ -20382,5 +20374,5 @@ #. 50000 #. -#. +#. #. #. @@ -20390,5 +20382,5 @@ #. 50000 #. -#. +#. #. #. @@ -20398,5 +20390,5 @@ #. 50000 #. -#. +#. #. #. @@ -20406,5 +20398,5 @@ #. 50000 #. -#. +#. #. #. @@ -20414,5 +20406,5 @@ #. 50000 #. -#. +#. #. #. @@ -20422,5 +20414,5 @@ #. 50000 #. -#. +#. #. #. @@ -20430,5 +20422,5 @@ #. 50000 #. -#. +#. #. #. @@ -20438,5 +20430,5 @@ #. 50000 #. -#. +#. #. #. @@ -20446,5 +20438,5 @@ #. 50000 #. -#. +#. #. #. @@ -20454,5 +20446,5 @@ #. 50000 #. -#. +#. #. #. @@ -20462,5 +20454,5 @@ #. 50000 #. -#. +#. #. #. @@ -20470,5 +20462,5 @@ #. 50000 #. -#. +#. #. #. @@ -20478,5 +20470,5 @@ #. 50000 #. -#. +#. #. #. @@ -20486,5 +20478,5 @@ #. 50000 #. -#. +#. #. #. @@ -20494,5 +20486,5 @@ #. 50000 #. -#. +#. #. #. @@ -20502,5 +20494,5 @@ #. 50000 #. -#. +#. #. #. @@ -20510,5 +20502,5 @@ #. 50000 #. -#. +#. #. #. @@ -20518,5 +20510,5 @@ #. 50000 #. -#. +#. #. #. @@ -20526,5 +20518,5 @@ #. 50000 #. -#. +#. #. #. @@ -20534,5 +20526,5 @@ #. 50000 #. -#. +#. #. #. @@ -20542,5 +20534,5 @@ #. 50000 #. -#. +#. #. #. @@ -22234,7 +22226,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22244,5 +22236,5 @@ #. 50000 #. -#. +#. #. #. @@ -22252,5 +22244,5 @@ #. 50000 #. -#. +#. #. #. @@ -22260,5 +22252,5 @@ #. 50000 #. -#. +#. #. #. @@ -22268,5 +22260,5 @@ #. 50000 #. -#. +#. #. #. @@ -22276,5 +22268,5 @@ #. 50000 #. -#. +#. #. #. @@ -22284,5 +22276,5 @@ #. 50000 #. -#. +#. #. #. @@ -22292,5 +22284,5 @@ #. 50000 #. -#. +#. #. #. @@ -23621,5 +23613,5 @@ #. 40000 #. -#. +#. #. #. @@ -23635,5 +23627,5 @@ #. 30000 #. -#. +#. #. #. @@ -23644,7 +23636,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23654,5 +23646,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -23662,13 +23662,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -23678,5 +23670,5 @@ #. 50000 #. -#. +#. #. #. @@ -23709,5 +23701,5 @@ #. 50000 #. -#. +#. #. #. @@ -23723,5 +23715,5 @@ #. 50000 #. -#. +#. #. #. @@ -23731,5 +23723,5 @@ #. 10000 #. -#. +#. #. #. @@ -23739,5 +23731,5 @@ #. 10000 #. -#. +#. #. #. @@ -23748,5 +23740,5 @@ #. 10000 #. -#. +#. #. #. @@ -23775,5 +23767,5 @@ #. 50000 #. -#. +#. #. #. @@ -23888,9 +23880,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 @@ -23898,5 +23890,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, @@ -23906,8 +23898,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 @@ -23921,5 +23913,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23927,5 +23919,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23974,6 +23966,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -24053,5 +24045,5 @@ #. 40000 #. -#. +#. #. #. @@ -24061,5 +24053,5 @@ #. 10000 #. -#. +#. #. #. @@ -24068,5 +24060,5 @@ #. 50000 #. -#. +#. #. #. @@ -24076,5 +24068,5 @@ #. 50000 #. -#. +#. #. #. @@ -24083,5 +24075,5 @@ #. 50000 #. -#. +#. #. #. @@ -24090,5 +24082,5 @@ #. 50000 #. -#. +#. #. #. @@ -24097,5 +24089,5 @@ #. 50000 #. -#. +#. #. #. @@ -24104,5 +24096,5 @@ #. 50000 #. -#. +#. #. #. @@ -24111,5 +24103,5 @@ #. 40000 #. -#. +#. #. #. @@ -24118,5 +24110,5 @@ #. 50000 #. -#. +#. #. #. @@ -24125,5 +24117,5 @@ #. 50000 #. -#. +#. #. #. @@ -24132,5 +24124,5 @@ #. 50000 #. -#. +#. #. #. @@ -24139,5 +24131,5 @@ #. 50000 #. -#. +#. #. #. @@ -24146,5 +24138,5 @@ #. 50000 #. -#. +#. #. #. @@ -24153,5 +24145,5 @@ #. 50000 #. -#. +#. #. #. @@ -24161,5 +24153,5 @@ #. 50000 #. -#. +#. #. #. @@ -24168,5 +24160,5 @@ #. 50000 #. -#. +#. #. #. @@ -24177,5 +24169,5 @@ #. 50000 #. -#. +#. #. #. @@ -24187,11 +24179,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -24200,7 +24192,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24211,5 +24203,5 @@ #. 50000 #. -#. +#. #. #. @@ -24220,5 +24212,5 @@ #. 50000 #. -#. +#. #. #. @@ -24229,5 +24221,5 @@ #. 50000 #. -#. +#. #. #. @@ -24238,5 +24230,5 @@ #. 50000 #. -#. +#. #. #. @@ -24247,5 +24239,5 @@ #. 50000 #. -#. +#. #. #. @@ -24256,5 +24248,5 @@ #. 40000 #. -#. +#. #. #. @@ -24266,5 +24258,5 @@ #. 50000 #. -#. +#. #. #. @@ -24275,5 +24267,5 @@ #. 50000 #. -#. +#. #. #. @@ -24298,5 +24290,5 @@ #. 10000 #. -#. +#. #. #. @@ -24305,5 +24297,5 @@ #. 50000 #. -#. +#. #. #. @@ -24312,5 +24304,5 @@ #. 50000 #. -#. +#. #. #. @@ -24326,5 +24318,5 @@ #. 20000 #. -#. +#. #. #. @@ -24338,5 +24330,5 @@ #. 30000 #. -#. +#. #. #. @@ -24345,5 +24337,5 @@ #. 50000 #. -#. +#. #. #. @@ -24352,5 +24344,5 @@ #. 50000 #. -#. +#. #. #. @@ -24359,5 +24351,5 @@ #. 50000 #. -#. +#. #. #. @@ -24366,5 +24358,5 @@ #. 50000 #. -#. +#. #. #. @@ -24373,5 +24365,5 @@ #. 50000 #. -#. +#. #. #. @@ -24380,5 +24372,5 @@ #. 50000 #. -#. +#. #. #. @@ -24387,5 +24379,5 @@ #. 50000 #. -#. +#. #. #. @@ -24394,5 +24386,5 @@ #. 50000 #. -#. +#. #. #. @@ -24401,5 +24393,5 @@ #. 50000 #. -#. +#. #. #. @@ -24408,5 +24400,5 @@ #. 50000 #. -#. +#. #. #. @@ -24415,5 +24407,5 @@ #. 50000 #. -#. +#. #. #. @@ -24422,5 +24414,5 @@ #. 50000 #. -#. +#. #. #. @@ -24429,5 +24421,5 @@ #. 50000 #. -#. +#. #. #. @@ -24436,5 +24428,5 @@ #. 50000 #. -#. +#. #. #. @@ -24605,7 +24597,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24619,5 +24611,5 @@ #. 40000 #. -#. +#. #. #. @@ -24627,7 +24619,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24637,5 +24629,5 @@ #. 50000 #. -#. +#. #. #. @@ -24645,5 +24637,5 @@ #. 50000 #. -#. +#. #. #. @@ -24653,5 +24645,5 @@ #. 50000 #. -#. +#. #. #. @@ -24661,5 +24653,5 @@ #. 50000 #. -#. +#. #. #. @@ -24675,5 +24667,5 @@ #. 10000 #. -#. +#. #. #. @@ -24683,5 +24675,5 @@ #. 50000 #. -#. +#. #. #. @@ -24691,5 +24683,5 @@ #. 50000 #. -#. +#. #. #. @@ -24699,5 +24691,5 @@ #. 50000 #. -#. +#. #. #. @@ -24707,5 +24699,5 @@ #. 50000 #. -#. +#. #. #. @@ -24715,5 +24707,5 @@ #. 50000 #. -#. +#. #. #. @@ -24723,5 +24715,5 @@ #. 50000 #. -#. +#. #. #. @@ -24740,5 +24732,5 @@ #. 50000 #. -#. +#. #. #. @@ -24747,5 +24739,5 @@ #. 50000 #. -#. +#. #. #. @@ -24759,5 +24751,5 @@ #. 50000 #. -#. +#. #. #. @@ -24771,5 +24763,5 @@ #. 50000 #. -#. +#. #. #. @@ -24778,5 +24770,5 @@ #. 50000 #. -#. +#. #. #. @@ -24790,5 +24782,5 @@ #. 50000 #. -#. +#. #. #. @@ -24803,5 +24795,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24816,5 +24808,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24828,5 +24820,5 @@ #. 50000 #. -#. +#. #. #. @@ -24840,5 +24832,5 @@ #. 50000 #. -#. +#. #. #. @@ -24847,5 +24839,5 @@ #. 50000 #. -#. +#. #. #. @@ -24854,5 +24846,5 @@ #. 50000 #. -#. +#. #. #. @@ -24866,5 +24858,5 @@ #. 50000 #. -#. +#. #. #. @@ -24874,5 +24866,5 @@ #. 50000 #. -#. +#. #. #. @@ -24881,5 +24873,5 @@ #. 50000 #. -#. +#. #. #. @@ -24888,5 +24880,5 @@ #. 50000 #. -#. +#. #. #. @@ -24895,5 +24887,5 @@ #. 50000 #. -#. +#. #. #. @@ -24903,5 +24895,5 @@ #. 50000 #. -#. +#. #. #. @@ -24912,5 +24904,5 @@ #. 50000 #. -#. +#. #. #. @@ -24920,7 +24912,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24930,5 +24922,5 @@ #. 50000 #. -#. +#. #. #. @@ -24938,5 +24930,5 @@ #. 50000 #. -#. +#. #. #. @@ -24946,5 +24938,5 @@ #. 50000 #. -#. +#. #. #. @@ -24955,5 +24947,5 @@ #. 50000 #. -#. +#. #. #. @@ -24963,5 +24955,5 @@ #. 50000 #. -#. +#. #. #. @@ -24971,5 +24963,5 @@ #. 50000 #. -#. +#. #. #. @@ -24979,5 +24971,5 @@ #. 50000 #. -#. +#. #. #. @@ -24987,5 +24979,5 @@ #. 50000 #. -#. +#. #. #. @@ -24995,5 +24987,5 @@ #. 50000 #. -#. +#. #. #. @@ -25003,5 +24995,5 @@ #. 50000 #. -#. +#. #. #. @@ -25011,5 +25003,5 @@ #. 50000 #. -#. +#. #. #. @@ -25019,5 +25011,5 @@ #. 50000 #. -#. +#. #. #. @@ -25040,7 +25032,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25050,5 +25042,5 @@ #. 50000 #. -#. +#. #. #. @@ -25057,5 +25049,5 @@ #. 50000 #. -#. +#. #. #. @@ -25065,5 +25057,5 @@ #. 50000 #. -#. +#. #. #. @@ -25072,5 +25064,5 @@ #. 50000 #. -#. +#. #. #. @@ -25080,5 +25072,5 @@ #. 50000 #. -#. +#. #. #. @@ -25088,5 +25080,5 @@ #. 50000 #. -#. +#. #. #. @@ -25102,5 +25094,5 @@ #. 200000000 #. -#. +#. #. #. @@ -25111,5 +25103,5 @@ #. 50000 #. -#. +#. #. #. @@ -25128,5 +25120,5 @@ #. 50000 #. -#. +#. #. #. @@ -25136,5 +25128,5 @@ #. 50000 #. -#. +#. #. #. @@ -25147,5 +25139,5 @@ #. 50000 #. -#. +#. #. #. @@ -25163,5 +25155,5 @@ #. 50000 #. -#. +#. #. #. @@ -25170,5 +25162,5 @@ #. 50000 #. -#. +#. #. #. @@ -25177,5 +25169,5 @@ #. 50000 #. -#. +#. #. #. @@ -25184,7 +25176,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25195,5 +25187,5 @@ #. 50000 #. -#. +#. #. #. @@ -25208,5 +25200,5 @@ #. 50000 #. -#. +#. #. #. @@ -25220,5 +25212,5 @@ #. 50000 #. -#. +#. #. #. @@ -25228,5 +25220,5 @@ #. 50000 #. -#. +#. #. #. @@ -25240,5 +25232,5 @@ #. 50000 #. -#. +#. #. #. @@ -25252,5 +25244,5 @@ #. 50000 #. -#. +#. #. #. @@ -25259,7 +25251,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25269,5 +25261,5 @@ #. 50000 #. -#. +#. #. #. @@ -25277,5 +25269,5 @@ #. 50000 #. -#. +#. #. #. @@ -25285,5 +25277,5 @@ #. 50000 #. -#. +#. #. #. @@ -25293,5 +25285,5 @@ #. 50000 #. -#. +#. #. #. @@ -25307,7 +25299,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25322,5 +25314,5 @@ #. 30000 #. -#. +#. #. #. @@ -25335,5 +25327,5 @@ #. 30000 #. -#. +#. #. #. @@ -25348,5 +25340,5 @@ #. 30000 #. -#. +#. #. #. @@ -25361,5 +25353,5 @@ #. 30000 #. -#. +#. #. #. @@ -25374,5 +25366,5 @@ #. 30000 #. -#. +#. #. #. @@ -25387,7 +25379,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -25397,5 +25389,5 @@ #. 50000 #. -#. +#. #. #. @@ -25404,5 +25396,5 @@ #. 50000 #. -#. +#. #. #. @@ -25412,5 +25404,5 @@ #. 50000 #. -#. +#. #. #. @@ -25420,5 +25412,5 @@ #. 50000 #. -#. +#. #. #. @@ -25428,5 +25420,5 @@ #. 50000 #. -#. +#. #. #. @@ -25436,5 +25428,5 @@ #. 50000 #. -#. +#. #. #. @@ -25444,5 +25436,5 @@ #. 50000 #. -#. +#. #. #. @@ -25452,5 +25444,5 @@ #. 50000 #. -#. +#. #. #. @@ -25460,5 +25452,5 @@ #. 50000 #. -#. +#. #. #. @@ -25468,5 +25460,5 @@ #. 50000 #. -#. +#. #. #. @@ -25476,5 +25468,5 @@ #. 50000 #. -#. +#. #. #. @@ -25484,5 +25476,5 @@ #. 50000 #. -#. +#. #. #. @@ -25492,5 +25484,5 @@ #. 50000 #. -#. +#. #. #. @@ -25510,5 +25502,5 @@ #. 50000 #. -#. +#. #. #. @@ -25523,5 +25515,5 @@ #. 50000 #. -#. +#. #. #. @@ -25534,7 +25526,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25544,5 +25536,5 @@ #. 50000 #. -#. +#. #. #. @@ -25552,5 +25544,5 @@ #. 50000 #. -#. +#. #. #. @@ -25560,5 +25552,5 @@ #. 50000 #. -#. +#. #. #. @@ -25568,5 +25560,5 @@ #. 50000 #. -#. +#. #. #. @@ -25576,5 +25568,5 @@ #. 50000 #. -#. +#. #. #. @@ -25584,5 +25576,5 @@ #. 50000 #. -#. +#. #. #. @@ -25592,5 +25584,5 @@ #. 50000 #. -#. +#. #. #. @@ -25600,5 +25592,5 @@ #. 50000 #. -#. +#. #. #. @@ -25608,5 +25600,5 @@ #. 50000 #. -#. +#. #. #. @@ -25616,5 +25608,5 @@ #. 50000 #. -#. +#. #. #. @@ -25624,5 +25616,5 @@ #. 50000 #. -#. +#. #. #. @@ -25632,5 +25624,5 @@ #. 50000 #. -#. +#. #. #. @@ -25640,5 +25632,5 @@ #. 50000 #. -#. +#. #. #. @@ -25648,5 +25640,5 @@ #. 50000 #. -#. +#. #. #. @@ -25667,5 +25659,5 @@ #. 50000 #. -#. +#. #. #. @@ -25679,7 +25671,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25689,5 +25681,5 @@ #. 50000 #. -#. +#. #. #. @@ -25697,5 +25689,5 @@ #. 50000 #. -#. +#. #. #. @@ -25705,5 +25697,5 @@ #. 50000 #. -#. +#. #. #. @@ -25713,5 +25705,5 @@ #. 50000 #. -#. +#. #. #. @@ -25721,5 +25713,5 @@ #. 50000 #. -#. +#. #. #. @@ -25729,5 +25721,5 @@ #. 50000 #. -#. +#. #. #. @@ -25737,5 +25729,5 @@ #. 50000 #. -#. +#. #. #. @@ -25752,5 +25744,5 @@ #. 50000 #. -#. +#. #. #. @@ -25760,5 +25752,5 @@ #. 50000 #. -#. +#. #. #. @@ -25768,5 +25760,5 @@ #. 50000 #. -#. +#. #. #. @@ -25776,5 +25768,5 @@ #. 50000 #. -#. +#. #. #. @@ -25784,5 +25776,5 @@ #. 50000 #. -#. +#. #. #. @@ -25792,5 +25784,5 @@ #. 50000 #. -#. +#. #. #. @@ -25800,5 +25792,5 @@ #. 50000 #. -#. +#. #. #. @@ -25808,5 +25800,5 @@ #. 50000 #. -#. +#. #. #. @@ -25816,5 +25808,5 @@ #. 50000 #. -#. +#. #. #. @@ -25824,5 +25816,5 @@ #. 50000 #. -#. +#. #. #. @@ -25832,5 +25824,5 @@ #. 50000 #. -#. +#. #. #. @@ -25840,5 +25832,5 @@ #. 50000 #. -#. +#. #. #. @@ -25857,5 +25849,5 @@ #. 50000 #. -#. +#. #. #. @@ -25865,5 +25857,5 @@ #. 50000 #. -#. +#. #. #. @@ -25872,5 +25864,5 @@ #. 50000 #. -#. +#. #. #. @@ -25880,5 +25872,5 @@ #. 50000 #. -#. +#. #. #. @@ -25888,5 +25880,5 @@ #. 50000 #. -#. +#. #. #. @@ -25896,5 +25888,5 @@ #. 50000 #. -#. +#. #. #. @@ -25903,5 +25895,5 @@ #. 50000 #. -#. +#. #. #. @@ -25911,5 +25903,5 @@ #. 50000 #. -#. +#. #. #. @@ -25919,5 +25911,5 @@ #. 50000 #. -#. +#. #. #. @@ -25927,5 +25919,5 @@ #. 50000 #. -#. +#. #. #. @@ -25935,5 +25927,5 @@ #. 50000 #. -#. +#. #. #. @@ -25942,5 +25934,5 @@ #. 50000 #. -#. +#. #. #. @@ -25949,5 +25941,5 @@ #. 50000 #. -#. +#. #. #. @@ -25956,5 +25948,5 @@ #. 50000 #. -#. +#. #. #. @@ -25963,5 +25955,5 @@ #. 50000 #. -#. +#. #. #. @@ -25970,5 +25962,5 @@ #. 50000 #. -#. +#. #. #. @@ -25977,5 +25969,5 @@ #. 50000 #. -#. +#. #. #. @@ -25984,5 +25976,5 @@ #. 50000 #. -#. +#. #. #. @@ -25991,5 +25983,5 @@ #. 50000 #. -#. +#. #. #. @@ -25998,5 +25990,5 @@ #. 50000 #. -#. +#. #. #. @@ -26005,5 +25997,5 @@ #. 50000 #. -#. +#. #. #. @@ -26012,5 +26004,5 @@ #. 50000 #. -#. +#. #. #. @@ -26019,5 +26011,5 @@ #. 50000 #. -#. +#. #. #. @@ -26026,5 +26018,5 @@ #. 50000 #. -#. +#. #. #. @@ -26034,5 +26026,5 @@ #. 50000 #. -#. +#. #. #. @@ -26042,5 +26034,5 @@ #. 50000 #. -#. +#. #. #. @@ -26050,5 +26042,5 @@ #. 50000 #. -#. +#. #. #. @@ -26058,5 +26050,5 @@ #. 50000 #. -#. +#. #. #. @@ -26066,5 +26058,5 @@ #. 50000 #. -#. +#. #. #. @@ -26074,5 +26066,5 @@ #. 50000 #. -#. +#. #. #. @@ -26082,5 +26074,5 @@ #. 50000 #. -#. +#. #. #. @@ -26090,5 +26082,5 @@ #. 50000 #. -#. +#. #. #. @@ -26098,5 +26090,5 @@ #. 50000 #. -#. +#. #. #. @@ -26107,5 +26099,5 @@ #. 50000 #. -#. +#. #. #. @@ -26115,5 +26107,5 @@ #. 50000 #. -#. +#. #. #. @@ -26123,5 +26115,5 @@ #. 50000 #. -#. +#. #. #. @@ -26131,5 +26123,5 @@ #. 50000 #. -#. +#. #. #. @@ -26139,5 +26131,5 @@ #. 50000 #. -#. +#. #. #. @@ -26147,5 +26139,5 @@ #. 50000 #. -#. +#. #. #. @@ -26155,5 +26147,5 @@ #. 50000 #. -#. +#. #. #. @@ -26163,5 +26155,5 @@ #. 50000 #. -#. +#. #. #. @@ -26171,5 +26163,5 @@ #. 50000 #. -#. +#. #. #. @@ -26179,5 +26171,5 @@ #. 50000 #. -#. +#. #. #. @@ -26187,5 +26179,5 @@ #. 50000 #. -#. +#. #. #. @@ -26195,5 +26187,5 @@ #. 50000 #. -#. +#. #. #. @@ -26203,5 +26195,5 @@ #. 50000 #. -#. +#. #. #. @@ -26211,5 +26203,5 @@ #. 50000 #. -#. +#. #. #. @@ -26219,5 +26211,5 @@ #. 50000 #. -#. +#. #. #. @@ -26227,5 +26219,5 @@ #. 50000 #. -#. +#. #. #. @@ -26235,5 +26227,5 @@ #. 50000 #. -#. +#. #. #. @@ -26243,5 +26235,5 @@ #. 50000 #. -#. +#. #. #. @@ -26251,5 +26243,5 @@ #. 50000 #. -#. +#. #. #. @@ -26258,5 +26250,5 @@ #. 50000 #. -#. +#. #. #. @@ -26288,5 +26280,5 @@ #. 50000 #. -#. +#. #. #. @@ -26296,5 +26288,5 @@ #. 50000 #. -#. +#. #. #. @@ -26304,7 +26296,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26319,5 +26311,5 @@ #. 50000 #. -#. +#. #. #. @@ -26327,5 +26319,5 @@ #. 50000 #. -#. +#. #. #. @@ -26335,5 +26327,5 @@ #. 50000 #. -#. +#. #. #. @@ -26343,5 +26335,5 @@ #. 50000 #. -#. +#. #. #. @@ -26351,5 +26343,5 @@ #. 50000 #. -#. +#. #. #. @@ -26359,5 +26351,5 @@ #. 50000 #. -#. +#. #. #. @@ -26367,5 +26359,5 @@ #. 50000 #. -#. +#. #. #. @@ -26381,7 +26373,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -26391,5 +26383,5 @@ #. 50000 #. -#. +#. #. #. @@ -26399,5 +26391,5 @@ #. 50000 #. -#. +#. #. #. @@ -26407,5 +26399,5 @@ #. 50000 #. -#. +#. #. #. @@ -26415,5 +26407,5 @@ #. 50000 #. -#. +#. #. #. @@ -26423,5 +26415,5 @@ #. 50000 #. -#. +#. #. #. @@ -26431,5 +26423,5 @@ #. 50000 #. -#. +#. #. #. @@ -26439,5 +26431,5 @@ #. 50000 #. -#. +#. #. #. @@ -26447,5 +26439,5 @@ #. 50000 #. -#. +#. #. #. @@ -26455,5 +26447,5 @@ #. 50000 #. -#. +#. #. #. @@ -26463,5 +26455,5 @@ #. 50000 #. -#. +#. #. #. @@ -26471,5 +26463,5 @@ #. 50000 #. -#. +#. #. #. @@ -26479,5 +26471,5 @@ #. 50000 #. -#. +#. #. #. @@ -26487,5 +26479,5 @@ #. 50000 #. -#. +#. #. #. @@ -26495,5 +26487,5 @@ #. 50000 #. -#. +#. #. #. @@ -26503,5 +26495,5 @@ #. 50000 #. -#. +#. #. #. @@ -26511,5 +26503,5 @@ #. 50000 #. -#. +#. #. #. @@ -26519,5 +26511,5 @@ #. 50000 #. -#. +#. #. #. @@ -26527,5 +26519,5 @@ #. 50000 #. -#. +#. #. #. @@ -26535,5 +26527,5 @@ #. 50000 #. -#. +#. #. #. @@ -26543,5 +26535,5 @@ #. 50000 #. -#. +#. #. #. @@ -26551,5 +26543,5 @@ #. 50000 #. -#. +#. #. #. @@ -26559,5 +26551,5 @@ #. 50000 #. -#. +#. #. #. @@ -26567,5 +26559,5 @@ #. 50000 #. -#. +#. #. #. @@ -26575,5 +26567,5 @@ #. 50000 #. -#. +#. #. #. @@ -26583,5 +26575,5 @@ #. 50000 #. -#. +#. #. #. @@ -26591,5 +26583,5 @@ #. 50000 #. -#. +#. #. #. @@ -26599,5 +26591,5 @@ #. 50000 #. -#. +#. #. #. @@ -26607,5 +26599,5 @@ #. 50000 #. -#. +#. #. #. @@ -26615,5 +26607,5 @@ #. 50000 #. -#. +#. #. #. @@ -26623,5 +26615,5 @@ #. 50000 #. -#. +#. #. #. @@ -26631,5 +26623,5 @@ #. 50000 #. -#. +#. #. #. @@ -26639,5 +26631,5 @@ #. 50000 #. -#. +#. #. #. @@ -26647,5 +26639,5 @@ #. 50000 #. -#. +#. #. #. @@ -26655,5 +26647,5 @@ #. 50000 #. -#. +#. #. #. @@ -26663,5 +26655,5 @@ #. 50000 #. -#. +#. #. #. @@ -26671,5 +26663,5 @@ #. 50000 #. -#. +#. #. #. @@ -26679,5 +26671,5 @@ #. 50000 #. -#. +#. #. #. @@ -26687,5 +26679,5 @@ #. 50000 #. -#. +#. #. #. @@ -26695,5 +26687,5 @@ #. 50000 #. -#. +#. #. #. @@ -26703,5 +26695,5 @@ #. 50000 #. -#. +#. #. #. @@ -26711,5 +26703,5 @@ #. 50000 #. -#. +#. #. #. @@ -26719,5 +26711,5 @@ #. 50000 #. -#. +#. #. #. @@ -26753,7 +26745,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26763,5 +26755,5 @@ #. 50000 #. -#. +#. #. #. @@ -26771,5 +26763,5 @@ #. 50000 #. -#. +#. #. #. @@ -26779,5 +26771,5 @@ #. 50000 #. -#. +#. #. #. @@ -26787,5 +26779,5 @@ #. 50000 #. -#. +#. #. #. @@ -26795,5 +26787,5 @@ #. 50000 #. -#. +#. #. #. @@ -26803,5 +26795,5 @@ #. 50000 #. -#. +#. #. #. @@ -26811,5 +26803,5 @@ #. 50000 #. -#. +#. #. #. @@ -26826,5 +26818,5 @@ #. 50000 #. -#. +#. #. #. @@ -26834,5 +26826,5 @@ #. 50000 #. -#. +#. #. #. @@ -26842,5 +26834,5 @@ #. 50000 #. -#. +#. #. #. @@ -26850,5 +26842,5 @@ #. 50000 #. -#. +#. #. #. @@ -26858,5 +26850,5 @@ #. 50000 #. -#. +#. #. #. @@ -26866,5 +26858,5 @@ #. 50000 #. -#. +#. #. #. @@ -26875,5 +26867,5 @@ #. 50000 #. -#. +#. #. #. @@ -26883,5 +26875,5 @@ #. 50000 #. -#. +#. #. #. @@ -26891,5 +26883,5 @@ #. 40000 #. -#. +#. #. #. @@ -26899,5 +26891,5 @@ #. 50000 #. -#. +#. #. #. @@ -26906,5 +26898,5 @@ #. 40000 #. -#. +#. #. #. @@ -26913,5 +26905,5 @@ #. 40000 #. -#. +#. #. #. @@ -26929,7 +26921,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26939,5 +26931,5 @@ #. 50000 #. -#. +#. #. #. @@ -26947,5 +26939,5 @@ #. 50000 #. -#. +#. #. #. @@ -26955,5 +26947,5 @@ #. 50000 #. -#. +#. #. #. @@ -26963,5 +26955,5 @@ #. 50000 #. -#. +#. #. #. @@ -26971,5 +26963,5 @@ #. 50000 #. -#. +#. #. #. @@ -26979,5 +26971,5 @@ #. 50000 #. -#. +#. #. #. @@ -26987,5 +26979,5 @@ #. 50000 #. -#. +#. #. #. @@ -26995,5 +26987,5 @@ #. 50000 #. -#. +#. #. #. @@ -27003,5 +26995,5 @@ #. 50000 #. -#. +#. #. #. @@ -27020,5 +27012,5 @@ #. 50000 #. -#. +#. #. #. @@ -27032,5 +27024,5 @@ #. 50000 #. -#. +#. #. #. @@ -27044,5 +27036,5 @@ #. 50000 #. -#. +#. #. #. @@ -27052,5 +27044,5 @@ #. 50000 #. -#. +#. #. #. @@ -27064,5 +27056,5 @@ #. 50000 #. -#. +#. #. #. @@ -27076,5 +27068,5 @@ #. 50000 #. -#. +#. #. #. @@ -27088,6 +27080,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -27097,5 +27089,5 @@ #. 50000 #. -#. +#. #. #. @@ -27109,5 +27101,5 @@ #. 50000 #. -#. +#. #. #. @@ -27121,5 +27113,5 @@ #. 50000 #. -#. +#. #. #. @@ -27133,5 +27125,5 @@ #. 50000 #. -#. +#. #. #. @@ -27145,5 +27137,5 @@ #. 50000 #. -#. +#. #. #. @@ -27157,5 +27149,5 @@ #. 50000 #. -#. +#. #. #. @@ -27165,7 +27157,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27175,5 +27167,5 @@ #. 50000 #. -#. +#. #. #. @@ -27183,5 +27175,5 @@ #. 50000 #. -#. +#. #. #. @@ -27191,5 +27183,5 @@ #. 50000 #. -#. +#. #. #. @@ -27199,5 +27191,5 @@ #. 50000 #. -#. +#. #. #. @@ -27214,5 +27206,5 @@ #. 50000 #. -#. +#. #. #. @@ -27225,5 +27217,5 @@ #. 50000 #. -#. +#. #. #. @@ -27237,5 +27229,5 @@ #. 50000 #. -#. +#. #. #. @@ -27249,5 +27241,5 @@ #. 50000 #. -#. +#. #. #. @@ -27261,5 +27253,5 @@ #. 50000 #. -#. +#. #. #. @@ -27270,5 +27262,5 @@ #. 50000 #. -#. +#. #. #. @@ -27278,5 +27270,5 @@ #. 50000 #. -#. +#. #. #. @@ -27286,5 +27278,5 @@ #. 50000 #. -#. +#. #. #. @@ -27294,5 +27286,5 @@ #. 50000 #. -#. +#. #. #. @@ -27302,5 +27294,5 @@ #. 50000 #. -#. +#. #. #. @@ -27317,5 +27309,5 @@ #. 50000 #. -#. +#. #. #. @@ -27329,5 +27321,5 @@ #. 50000 #. -#. +#. #. #. @@ -27341,5 +27333,5 @@ #. 50000 #. -#. +#. #. #. @@ -27353,5 +27345,5 @@ #. 50000 #. -#. +#. #. #. @@ -27365,5 +27357,5 @@ #. 50000 #. -#. +#. #. #. @@ -27377,5 +27369,5 @@ #. 50000 #. -#. +#. #. #. @@ -27384,7 +27376,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27394,5 +27386,5 @@ #. 50000 #. -#. +#. #. #. @@ -27402,5 +27394,5 @@ #. 50000 #. -#. +#. #. #. @@ -27410,5 +27402,5 @@ #. 50000 #. -#. +#. #. #. @@ -27418,5 +27410,5 @@ #. 50000 #. -#. +#. #. #. @@ -27426,5 +27418,5 @@ #. 50000 #. -#. +#. #. #. @@ -27434,5 +27426,5 @@ #. 50000 #. -#. +#. #. #. @@ -27442,5 +27434,5 @@ #. 50000 #. -#. +#. #. #. @@ -27457,7 +27449,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27467,5 +27459,5 @@ #. 50000 #. -#. +#. #. #. @@ -27475,5 +27467,5 @@ #. 50000 #. -#. +#. #. #. @@ -27483,5 +27475,5 @@ #. 50000 #. -#. +#. #. #. @@ -27491,5 +27483,5 @@ #. 50000 #. -#. +#. #. #. @@ -27505,5 +27497,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -27552,5 +27544,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27560,5 +27552,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27568,5 +27560,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27576,5 +27568,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27584,5 +27576,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27592,5 +27584,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27600,5 +27592,5 @@ #. 50000 #. -#. +#. #. #. @@ -27608,5 +27600,5 @@ #. 50000 #. -#. +#. #. #. @@ -27616,5 +27608,5 @@ #. 50000 #. -#. +#. #. #. @@ -27624,5 +27616,5 @@ #. 50000 #. -#. +#. #. #. @@ -27632,5 +27624,5 @@ #. 50000 #. -#. +#. #. #. @@ -27640,5 +27632,5 @@ #. 50000 #. -#. +#. #. #. @@ -27658,5 +27650,5 @@ #. 50000 #. -#. +#. #. #. @@ -27665,5 +27657,5 @@ #. 50000 #. -#. +#. #. #. @@ -27672,5 +27664,5 @@ #. 50000 #. -#. +#. #. #. @@ -27679,5 +27671,5 @@ #. 40000 #. -#. +#. #. #. @@ -27686,5 +27678,5 @@ #. 40000 #. -#. +#. #. #. @@ -27693,5 +27685,5 @@ #. 40000 #. -#. +#. #. #. @@ -27786,5 +27778,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -27792,28 +27784,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 @@ -27929,5 +27921,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27940,5 +27932,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27963,6 +27955,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27971,6 +27963,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27985,6 +27977,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 @@ -27998,6 +27990,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 @@ -28017,6 +28009,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -28040,6 +28032,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 @@ -28052,4 +28044,120 @@ msgstr "Sicily - Италия" +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Невозможно отменить команду ''{0}'' так как отсутствует слой ''{1}''" + +#~ msgid "Download all incomplete ways and nodes in relation" +#~ msgstr "Скачать недостающие части линий и точки, участвующие в отношении" + +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ 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 "No images with readable timestamps found." +#~ msgstr "Не найдено изображений с информацией о времени." + +#~ msgid "GPS start: {0}" +#~ msgstr "Начало GPS: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "Конец GPS: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "текущая разница: {0} с." + +#~ msgid "timezone difference: " +#~ msgstr "разница в часовых поясах: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} в пределах трека" + +#~ msgid "Sync clock" +#~ msgstr "Синхронизация часов" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Невозможно прочесть дату из файла \"{0}\"" + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "EXIF файла \"{0}\" не содержит информации о времени." + +#~ msgid "Image" +#~ msgstr "Изображение" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Часовой пояс GPS объекта (отличается от фотографии)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Синхронизировать время с GPS приёмником" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Введённое время невозможно использовать" + +#~ msgid "" +#~ "WARNING: no API version defined for data to upload. Falling back to " +#~ "version 0.6" +#~ msgstr "" +#~ "Предупреждение: нет версии API предназначенной для загрузки данных на " +#~ "сервер. Возврат к версии 0.6" + +#~ 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 "" +#~ "ПРЕДУПРЕЖДЕНИЕ: параметр ''{0}'' или версия API ''{1}'' набора данных " +#~ "требует загрузку на сервер изменений, но API не способна выполнить это. " +#~ "Загрузка изменений на сервер будет проигнорирована." + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "Был запрос на загрузку модуля {0}. Этот модуль бульше не нужен." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Изображения с геотегами" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Открыть изображения через AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "Настройки osm рендера" + +#~ msgid "Group common Address Interpolation inputs in a single dialog," +#~ msgstr "" +#~ "Сгруппировать ввод простой интерполяции адресов в единственный диалог," + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Модуль геотега для JOSM. Совмещает фотографии с GPS треками или " +#~ "импортирует геотеги из EXIF фотографий." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Несколько утилит, которые делают вашу жизнь проще: например, упростить " +#~ "линию; объединить полигоны; перейти в указанную точку." + #~ msgid "No data imported." #~ msgstr "Данные не импортированы" @@ -28095,6 +28203,6 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" #~ "У выделенных линий различается участие в отношениях. Всё равно хотите их " @@ -28110,5 +28218,4 @@ #~ msgstr "Разделить сегмент линии" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Ошибка при загрузке страницы {0}" @@ -28120,16 +28227,10 @@ #~ msgstr "Вращать" -#, java-format #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "Разрешить {0} конфликтов в {1} объектах" -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Удалить {1} {0}" - #~ msgid "my version:" #~ msgstr "моя версия:" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -28208,15 +28309,13 @@ #~ msgstr "Объект" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Использовать шаблон ''{0}'' из группы ''{1}''" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Использовать шаблон ''{0}''" #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" #~ "Внутренняя ошибка: невозможно проверить условия без слоя. Пожалуйста, " @@ -28224,6 +28323,6 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" #~ "Выделенные точки участвуют в различных отношениях. Всё равно хотите " @@ -28236,5 +28335,4 @@ #~ msgstr "Разрешённая версия:" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Для работы модуля нужна более новая версия JOSM: {0}." @@ -28247,12 +28345,9 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" -#~ "Откатить состояние выбранных объектов до версии, указанной в списке правок." - -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Ошибка при скачивании модуля: {0}" +#~ "Откатить состояние выбранных объектов до версии, указанной в списке " +#~ "правок." #~ msgid "Plugin already exists" @@ -28332,5 +28427,4 @@ #~ msgstr "Вы действительно желаете отметить проблему, как решённую?" -#, java-format #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." @@ -28346,9 +28440,9 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" -#~ "Попытайтесь обновиться до новейшей версии модуля перед созданием отчёта об " -#~ "ошибке." +#~ "Попытайтесь обновиться до новейшей версии модуля перед созданием отчёта " +#~ "об ошибке." #~ msgid "Found element in non-relation." @@ -28360,9 +28454,9 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" -#~ "Внимание! Пароль хранится в открытом виде в файле настроек.
Пароль " -#~ "передаётся по сети в открытом виде, как параметр запроса.
Не " +#~ "Внимание! Пароль хранится в открытом виде в файле настроек.
" +#~ "Пароль передаётся по сети в открытом виде, как параметр запроса.
Не " #~ "используйте ценный пароль." @@ -28373,5 +28467,4 @@ #~ msgstr "Опускающаяся решётка" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Пожалуйста, создайте отчёт об ошибке по адресу {0}" @@ -28385,5 +28478,4 @@ #~ "подробнее!)" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28402,5 +28494,4 @@ #~ msgstr "Загрузить на OSM..." -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -28414,5 +28505,4 @@ #~ "{0}" -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Невозможно скачать модуль: {0} из {1} доступных" @@ -28430,7 +28520,4 @@ #~ msgstr "Ошибка разбора" -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Пожалуйста, введите сначала желаемые координаты" - #~ msgid "OSM username (email)" #~ msgstr "Имя пользователя OSM (e-mail)" @@ -28454,17 +28541,13 @@ #~ msgstr "Возможно только редактирование справочных страниц JOSM Online Help" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Авторы: {0}" -#, java-format #~ msgid "Layers: {0}" #~ msgstr "Слои: {0}" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Конфликты: {0}" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Не удается прочитать каталог с настройками: {0}" @@ -28488,7 +28571,7 @@ #~ msgstr "Открыть окно OpenStreetBugs, и включить автоматическое скачивание" -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "Модуль {0} поврежден, либо не скачался автоматически" @@ -28500,6 +28583,6 @@ #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." #~ msgstr "" -#~ "Источник (URL или имя файла) файла с предустановками тегов. См. " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets для большей информации." +#~ "Источник (URL или имя файла) файла с предустановками тегов. См. http://" +#~ "josm.openstreetmap.de/wiki/TaggingPresets для большей информации." #~ msgid "Add a new tagging preset source to the list." @@ -28530,6 +28613,6 @@ #~ msgstr "Зона" -#, java-format -#~ msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" #~ msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}" @@ -28561,5 +28644,4 @@ #~ msgstr "Удалить слой" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Редактор отношений: {0}" @@ -28587,5 +28669,6 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" #~ "Не найдено данных для обновления. Вы уже открыли скачанный слой данных?" @@ -28594,5 +28677,4 @@ #~ msgstr "Эта ошибка вызвана в течении массовой загрузки:" -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -28616,9 +28698,9 @@ #~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You can " -#~ "adjust the sliders to manually match the photos." +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." #~ msgstr "" -#~ "Произошла ошибка при попытке сопоставить фотографии с GPX треком. Вы можете " -#~ "настроить вручную с помощью ползунов соответствие фотографиям." +#~ "Произошла ошибка при попытке сопоставить фотографии с GPX треком. Вы " +#~ "можете настроить вручную с помощью ползунов соответствие фотографиям." #~ msgid "Lambert Zone 4 cache file (.4)" @@ -28631,5 +28713,4 @@ #~ msgstr "Lambert зона 21 кэш файл (.2)" -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "Изменение проекции на {0} в первую очередь." @@ -28644,9 +28725,8 @@ #~ msgstr "Править справочное бюро" -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "" -#~ "Пропуск линии потому, что она включает в себя узлы, которые не существуют: " -#~ "{0}\n" +#~ "Пропуск линии потому, что она включает в себя узлы, которые не " +#~ "существуют: {0}\n" #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" @@ -28660,5 +28740,4 @@ #~ msgstr "Удалить узлы маршрутизации" -#, java-format #~ msgid "requested: {0}" #~ msgstr "предлагается: {0}" @@ -28678,6 +28757,6 @@ #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." #~ msgstr "" -#~ "ЭТО ЭКСПЕРИМЕНТАЛЬНАЯ ВОЗМОЖНОСТЬ. Сохраните вашу работу и проверьте перед " -#~ "загрузкой." +#~ "ЭТО ЭКСПЕРИМЕНТАЛЬНАЯ ВОЗМОЖНОСТЬ. Сохраните вашу работу и проверьте " +#~ "перед загрузкой." #~ msgid "No intersections found. Nothing was changed." @@ -28685,6 +28764,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -28701,6 +28780,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example,replacing 73 with your image id: \n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28725,16 +28804,15 @@ #~ "Для карты Metacarta Rectifier http://labs.metacarta.com/rectifier/, вам " #~ "нужно всего лишь ввести соответствующие \"ID\".\n" -#~ "Чтобы добавить карту Metacarta Rectifier нужно в меню вручную создать URL, " -#~ "как в этом примере, вместо 73 с ID вашего изображения:\n" +#~ "Чтобы добавить карту Metacarta Rectifier нужно в меню вручную создать " +#~ "URL, как в этом примере, вместо 73 с ID вашего изображения:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" #~ " \n" -#~ "Примечание: Убедитесь, что изображение согласовано с координатам, если есть " -#~ "сомнения в лицензионных правах на изображение, то не используйте его." +#~ "Примечание: Убедитесь, что изображение согласовано с координатам, если " +#~ "есть сомнения в лицензионных правах на изображение, то не используйте его." #~ msgid "Metacarta Map Rectifier image id" #~ msgstr "ID изобрадения карты Metacarta Rectifier" -#, java-format #~ msgid "rectifier id={0}" #~ msgstr "выпрямитель id={0}" @@ -28745,14 +28823,14 @@ #~ msgid "" #~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to OSM " -#~ "eg. deleting uninteresting parts of track." +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." #~ msgstr "" #~ "Главная особенность плагина является возможность удаления точек на GPX " -#~ "треке. Этот плагин может быть использован для подготовки треков для загрузки " -#~ "на OSM. Например, удалить неинтересные части трека." +#~ "треке. Этот плагин может быть использован для подготовки треков для " +#~ "загрузки на OSM. Например, удалить неинтересные части трека." #~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to selected " -#~ "user, opens browser showing selected author profile page." +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." #~ msgstr "" #~ "Инструменты для работы с авторами / пользователями. Выбирайте данные на " @@ -28778,5 +28856,4 @@ #~ msgstr "виадук" -#, java-format #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "Картинка {0} не существует или произошла ошибка чтения." @@ -28791,5 +28868,4 @@ #~ msgstr "Номер версии отсутствует по данным OSM" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28810,5 +28886,4 @@ #~ msgstr "% долготы:" -#, java-format #~ msgid "Checking whether node {0} is gone ..." #~ msgstr "Проверка существования узла {0} в прошлом..." @@ -28820,5 +28895,4 @@ #~ msgstr "Восстановление удаленного пути..." -#, java-format #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Проверка существования примитива {0} в прошлом..." @@ -28836,27 +28910,27 @@ #~ msgstr "Обнаружен конфликт" -#, java-format #~ msgid "" -#~ "The OSM primitive with id {0} has been deleted
on " -#~ "the server by another mapper.

Click {1} to keep your " -#~ "primitive and ignore the deleted state.
Your primitive will be assigend a " -#~ "new id.
Click {2} to accept the state on the server and " -#~ "to delete your primitive.
Click {3} to cancel.
" +#~ "The OSM primitive with id {0} has been " +#~ "deleted
on the server by another mapper.

Click {1} to keep your primitive and ignore the deleted state.
Your " +#~ "primitive will be assigend a new id.
Click {2} to " +#~ "accept the state on the server and to delete your primitive.
Click " +#~ "{3} to cancel.
" #~ msgstr "" -#~ "OSM примитив с id {0} был удален
с сервера другим " -#~ "картографом.

Нажмите {1} для сохранения вашего " -#~ "примитива и игнорирования попытки удаления.
Ваш примитив будет добавлен " -#~ "с новым id.
Нажмите {2} для согласия с удалением " -#~ "примитива, (ваш примитив будет удален).
Нажмите {3} для " -#~ "отмены.
" - -#, java-format +#~ "OSM примитив с id {0} был удален
с сервера " +#~ "другим картографом.

Нажмите {1} для сохранения " +#~ "вашего примитива и игнорирования попытки удаления.
Ваш примитив будет " +#~ "добавлен с новым id.
Нажмите {2} для согласия с " +#~ "удалением примитива, (ваш примитив будет удален).
Нажмите {3} для отмены.
" + #~ msgid "" -#~ "There are {0} primitives
selected for individual " -#~ "update. Please reduce the selection
to max. {1} primitives." +#~ "There are {0} primitives
selected for " +#~ "individual update. Please reduce the selection
to max. {1} primitives." +#~ "" #~ msgstr "" #~ "Выбрано {0} примитивов
для индивидуального " -#~ "обновления. Пожалуйста, уменьшите выделение
до макс. {1} " -#~ "примитивов." +#~ "обновления. Пожалуйста, уменьшите выделение
до макс. {1} примитивов." #~ msgid "nodes" @@ -28878,5 +28952,4 @@ #~ msgstr "Достигнут перекрёсток" -#, java-format #~ msgid "removing reference from way {0}" #~ msgstr "удаление ссылки из линии {0}" @@ -28894,9 +28967,8 @@ #~ msgstr "Пункт истории" -#, java-format #~ msgid "Failed to load history from the server. Details:
{0}" #~ msgstr "" -#~ "Загрузка истории с сервера потерпела неудачу. " -#~ "Подробности:
{0}" +#~ "Загрузка истории с сервера потерпела неудачу. Подробности:
{0}" #~ msgid "parameter '{0}' must not be null" @@ -28909,9 +28981,7 @@ #~ msgstr "ГСК WGS84" -#, java-format #~ msgid "Layer {0} must be in list of layers" #~ msgstr "Слой{0} должен быть в списке слоев" -#, java-format #~ msgid "Remove relation member {0} {1}" #~ msgstr "Удалить участника отношений {0} {1}" @@ -28930,7 +29000,7 @@ #~ "found." #~ msgstr "" -#~ "Неожиданная версия JOSM. Ни Main.ds, ни Main.getCurrentDataSet() не найдены." - -#, java-format +#~ "Неожиданная версия JOSM. Ни Main.ds, ни Main.getCurrentDataSet() не " +#~ "найдены." + #~ msgid "Do you really want to delete layer ''{0}''?" #~ msgstr "Вы действительно хотите удалить слой ''{0}''?" @@ -28939,14 +29009,12 @@ #~ msgstr "Удалить всё" -#, java-format #~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" #~ msgstr "" -#~ "Внимание: невозможно разместить диалоговое окно поверх всех окон. Исключение " -#~ "в: {0}" +#~ "Внимание: невозможно разместить диалоговое окно поверх всех окон. " +#~ "Исключение в: {0}" #~ msgid "Select a bookmark first." #~ msgstr "Сначала выберите закладку" -#, java-format #~ msgid "" #~ "There are unsaved changes in {0} layer. Discard the changes and continue?" @@ -28970,11 +29038,10 @@ #~ msgid "" -#~ "Select to upload the data using a new changeset and to leave the changeset " -#~ "open after the upload" +#~ "Select to upload the data using a new changeset and to leave the " +#~ "changeset open after the upload" #~ msgstr "" #~ "Выберите, чтобы выгрузить данные в новый пакет изменений, и оставить его " #~ "открытым после загрузки." -#, java-format #~ msgid "" #~ "Select to upload to the existing changeset {0} and to leave the changeset " @@ -28984,21 +29051,18 @@ #~ "его открытым после загрузки" -#, java-format #~ msgid "" #~ "Select to upload to the existing changeset {0} and to close the changeset " #~ "after this upload" #~ msgstr "" -#~ "Выберите, чтобы использовать существующий пакет изменений {0}, и закрыть его " -#~ "после загрузки" +#~ "Выберите, чтобы использовать существующий пакет изменений {0}, и закрыть " +#~ "его после загрузки" #~ msgid "Can't search because there is no loaded data." #~ msgstr "Поиск невозможен, так как не загружено никаких данных." -#, java-format #~ msgid "Use the existing changeset {0} and close it after upload" #~ msgstr "" #~ "Использовать текущий набор изменений {0} и закрыть его после загрузки" -#, java-format #~ msgid "Use the existing changeset {0} and leave it open" #~ msgstr "Использовать текущий список изменений {0} и оставить открытым" @@ -29007,5 +29071,4 @@ #~ msgstr "Заменить" -#, java-format #~ msgid "unsupported value ''{0}'' or parameter ''{1}''" #~ msgstr "неподдерживаемое значение ''{0}'' параметра ''{1}''" @@ -29014,5 +29077,4 @@ #~ msgstr "ещё не решено" -#, java-format #~ msgid "paramete''{0}'' must not be null" #~ msgstr "параметр ''{0}'' не может быть нулём" @@ -29021,13 +29083,12 @@ #~ msgstr "В отношении имеется пустой участник." -#, java-format #~ msgid "Help page missing. Create it in English." #~ msgstr "" -#~ "Страница справки отсутствует. Создайте её на английском." - -#, java-format +#~ "Страница справки отсутствует. Создайте её на английском." + #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" #~ "Страница справки отсутствует. Создайте её на английском " @@ -29039,22 +29100,20 @@ #~ msgid "" -#~ "Helppage missing. Create it in English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" -#~ "Страница справки отсутствует. Создайте её в English или " -#~ "вашем языке." - -#, java-format +#~ "Страница справки отсутствует. Создайте её в English " +#~ "или вашем языке." + #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" #~ msgstr "" #~ "Ошиочный заголовок \"{0}\" не соответствует ожидаемой структуре \"{1}\"" -#, java-format #~ msgid "" #~ "WARNING: launching browser windows for the first {0} of {1} selected " #~ "primitives only" #~ msgstr "" -#~ "ПРЕДУПРЕЖДЕНИЕ: запуск окон браузера только для первых {0} из {1} выделенных " -#~ "элементов" +#~ "ПРЕДУПРЕЖДЕНИЕ: запуск окон браузера только для первых {0} из {1} " +#~ "выделенных элементов" #~ msgid "Purging 1 primitive" @@ -29082,5 +29141,4 @@ #~ msgstr "Ошибка загрузки в OSM API" -#, java-format #~ msgid "" #~ "Uploading failed because a primitive you tried " @@ -29103,5 +29161,4 @@ #~ "минимум, из четырех точек." -#, java-format #~ msgid "{0} extrem nodes." #~ msgstr "{0} экстремальных точек." @@ -29120,5 +29177,4 @@ #~ "данные и начните новый слой в новой зоне." -#, java-format #~ msgid "Unexpected return value. Got {0}." #~ msgstr "неожиданное возвращённое значение. Получено {0}" @@ -29133,18 +29189,16 @@ #~ msgstr "более поздняя версия не найдена. История пуста." -#, java-format #~ msgid "Index out of bounds. Got {0}." #~ msgstr "Индекс вне допустимых пределов. Текущее значение {0}" -#, java-format #~ msgid "" #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." #~ msgstr "" -#~ "неверное значение обязательного атрибута ''{0}'' типа int, текущее значение " -#~ "''{1}''" - -#, java-format +#~ "неверное значение обязательного атрибута ''{0}'' типа int, текущее " +#~ "значение ''{1}''" + #~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''." +#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " +#~ "''{1}''." #~ msgstr "" #~ "неверное значение обязательного атрибута ''{0}'' типа int (>=0), текущее " @@ -29160,11 +29214,10 @@ #~ msgstr "Связанные" -#, java-format #~ msgid "MIddle way: {0}" #~ msgstr "Середина линии: {0}" #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -29180,6 +29233,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example, replacing 73 with your image id:\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -29188,6 +29241,6 @@ #~ "use." #~ msgstr "" -#~ "Можно добавлять, редактировать и удалять сервисы WMS на вкладке \"Параметры " -#~ "модуля WMS\" - они будут отображены в меню WMS.\n" +#~ "Можно добавлять, редактировать и удалять сервисы WMS на вкладке " +#~ "\"Параметры модуля WMS\" - они будут отображены в меню WMS.\n" #~ "\n" #~ "Также можно сделать это вручную в \"Расширенных настройках\", используя " @@ -29201,6 +29254,6 @@ #~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" #~ "\n" -#~ "Для Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) , всё " -#~ "что нужно - ввести соответствующий 'id'.\n" +#~ "Для Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) , " +#~ "всё что нужно - ввести соответствующий 'id'.\n" #~ "Чтобы добавить пункт меню \"Metacarta Map Rectifier\", создайте URL как в " #~ "приведённом примере, заменив 73 на id вашего изображения:\n" @@ -29217,13 +29270,11 @@ #~ msgstr "Заменить линию этим участником, связанным с объединённой линией" -#, java-format #~ msgid "" -#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back to " -#~ "default geometry. Details: {1}" +#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back " +#~ "to default geometry. Details: {1}" #~ msgstr "" #~ "Предупреждение: Не удалось восстановить геометрию окна из ключа ''{0}''. " #~ "Геометрия приведена к состоянию по умолчанию. Детали: {1}" -#, java-format #~ msgid "Processing {0}" #~ msgstr "Обработка {0}" @@ -29236,26 +29287,21 @@ #~ "Значения по умолчанию (Смотрите подсказки, чтобы узнать больше об этом)" -#, java-format #~ msgid "The XML source (URL or filename) for {0} definition files." #~ msgstr "" -#~ "Источник XML (URL-ссылка или имя файла) для заданных файлов в кол-ве {0} шт.." - -#, java-format +#~ "Источник XML (URL-ссылка или имя файла) для заданных файлов в кол-ве {0} " +#~ "шт.." + #~ msgid "Preset group ''{0}'' of group ''{1}''" #~ msgstr "Задать группу ''{0}'' в группе ''{1}''" -#, java-format #~ msgid "Relation: from {0} to {1} via {2}" #~ msgstr "Отношение: from (от) {0} to (до) {1} via (через) {2}" -#, java-format #~ msgid "Via node {0}, {1}" #~ msgstr "Точка \"via\" (через) {0}, {1}" -#, java-format #~ msgid "{0} via nodes." #~ msgstr "{0} точки \"via\" (через)." -#, java-format #~ msgid "" #~ "The OSM server ''{0}'' doesn't know about an object
you tried to read, " @@ -29269,16 +29315,14 @@ #~ "check the servers address ''{1}'' for typos." -#, java-format #~ msgid "" #~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " #~ "relation?" #~ msgstr "" -#~ "Выделенный объект \"{0}\" используется в отношении \"{1}\".
Удалить " -#~ "из отношения?" - -#, java-format +#~ "Выделенный объект \"{0}\" используется в отношении \"{1}\"." +#~ "
Удалить из отношения?" + #~ msgid "" -#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " -#~ "from relation?" +#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." +#~ "
Delete from relation?" #~ msgstr "" #~ "Выделенный объект \"{0}\" используется в отношении \"{1}\" в роли " @@ -29303,14 +29347,13 @@ #~ msgstr "широта" -#, java-format #~ msgid "" #~ "Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -#~ "changeset will automatically be closed by the server after a timeout." +#~ "changeset will automatically be closed by the server after a timeout." #~ msgstr "" -#~ "Невозможно закрыть пакет правок ''{0}'' на сервере OSM " -#~ "''{1}''.
Пакет правок будет автоматически закрыт сервером по истечении " -#~ "времени ожидания." - -#, java-format +#~ "Невозможно закрыть пакет правок ''{0}'' на сервере OSM ''{1}''." +#~ "
Пакет правок будет автоматически закрыт сервером по истечении времени " +#~ "ожидания." + #~ msgid "" #~ "Plugin {0} version {1} found but for this version of JOSM is at least " @@ -29323,5 +29366,4 @@ #~ msgstr "Задать вручную Lambert zone" -#, java-format #~ msgid "" #~ "Current layer is in Lambert CC9 Zone \"{0}\"\n" Index: /applications/editors/josm/i18n/po/sk.po =================================================================== --- /applications/editors/josm/i18n/po/sk.po (revision 18974) +++ /applications/editors/josm/i18n/po/sk.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:13+0000\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-12-02 16:29+0000\n" "Last-Translator: Vlado \n" "Language-Team: Slovak \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:04+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:18+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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" @@ -116,5 +115,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 @@ -137,9 +136,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 @@ -155,20 +154,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 @@ -187,7 +182,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 "Chyba" @@ -267,5 +262,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 "Pluginy" @@ -313,4 +308,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 @@ -318,8 +315,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 @@ -329,29 +326,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 @@ -380,9 +375,9 @@ #, java-format msgid "" -"There are no layers the source layer
''{0}''
could be merged " -"to." -msgstr "" -"Nie sú tam vrstvy zdrojovej vrstvy
''{0}''
nemôžu byť " -"zlúčené." +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" +"Nie sú tam vrstvy zdrojovej vrstvy
''{0}''
nemôžu byť zlúčené." #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 @@ -433,14 +428,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 "Zemepisná šírka" #: ../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 "Zemepisná dĺžka" @@ -448,17 +443,17 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 msgid "Please enter a valid latitude in the range -90..90" -msgstr "" +msgstr "Prosím vložte platnú zemepisnú šírku v rozsahu -90..90" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 msgid "Please enter a latitude in the range -90..90" -msgstr "" +msgstr "Prosím vložte zemepisnú šírku v rozsahu -90..90" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 msgid "Please enter a valid longitude in the range -180..180" -msgstr "" +msgstr "Prosím vložte platnú zemepisnú dĺžku v rozsahu -90..90" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 msgid "Please enter a longitude in the range -180..180" -msgstr "" +msgstr "Prosím vložte zemepisnú dĺžku v rozsahu -90..90" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 @@ -466,10 +461,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 @@ -481,9 +476,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 msgid "Close the dialog and create a new node" -msgstr "" +msgstr "Zatvorte dialóg a vytvorte nový bod" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 msgid "Close the dialog, don't create a new node" -msgstr "" +msgstr "Zatvorte dialóg, nevytvorte nový bod" #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 @@ -500,19 +495,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 @@ -521,9 +519,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 @@ -539,7 +534,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 @@ -551,11 +546,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" @@ -643,5 +638,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}" @@ -694,10 +689,10 @@ msgstr "Nemôžem spojiť cesty (Nemôžu byť spojené do jedného reťazca bodov)" -#: ../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 "Spojiť {0} ciest" -#: ../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 "Prosím, vyberte aspoň dve cesty pre spojenie." @@ -716,19 +711,19 @@ msgstr "Prosím zvoľ niečo pre kopírovanie" +#: ../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 "Vytvoriť kružnicu" -#: ../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 "Vytvoriť kružnicu z troch vybratých bodov." -#: ../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 "Tieto body niesú v kruhu. Prerušujem." -#: ../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 " @@ -741,9 +736,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 @@ -808,5 +803,5 @@ #, java-format msgid "Id > 0 required, got {0}" -msgstr "" +msgstr "vyžadované Id > 0, dostal som {0}" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89 @@ -815,21 +810,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" @@ -837,6 +836,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 @@ -865,5 +864,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 "Duplikovať" @@ -920,8 +919,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 @@ -929,5 +926,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 @@ -940,8 +937,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 @@ -960,8 +957,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 @@ -984,13 +981,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 @@ -1028,6 +1026,106 @@ #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17 msgid "Display object information about OSM nodes, ways, or relations." -msgstr "" -"Zobraziť informácie o objekte o OSM bodoch, cestách, alebo reláciách." +msgstr "Zobraziť informácie o objekte o OSM bodoch, cestách, alebo reláciách." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "Spojiť prekrývajúce sa Plochy" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Joins areas that overlap each other" +msgstr "Spojiť plochy ktoré sa prekrývajú" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +msgid "Only up to two areas can be joined at the moment." +msgstr "Teraz môžu byť spojené iba dve plochy(areas)." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#, java-format +msgid "\"{0}\" is not closed and therefore can't be joined." +msgstr "\"{0}\" niesú uzavreté a preto nemôžu byť spojené.." + +#: ../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 "" +"Vybratá cesta(y) ma body mimo sťahovanej oblasti dát.\n" +"Toto môže viesť k tomu, že body môžu byť náhodou vymazané.\n" +"Ste si naozaj istý, že chcete pokračovať?" + +#: ../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 "Prosím prerušiť ak ste si nie istý" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 +msgid "Please select at least one closed way the should be joined." +msgstr "Prosím vyberte aspoň jednu uzavretú cestu ktorá by mala byť spojená." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180 +msgid "No intersection found. Nothing was changed." +msgstr "Nenájdený žiadny priesečník. Nič nebolo zmenené." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202 +msgid "Added node on all intersections" +msgstr "Pridať body na všetky priesečníky" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgid "Delete Ways that are not part of an inner multipolygon" +msgstr "Vymazať cesty, ktoré nie sú vnútornou časťou multipolygónu" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +msgid "Fix relations" +msgstr "Oprava relácie" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgid "Joined self-overlapping area" +msgstr "Spojená prekrývajúca sa plocha" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +msgid "Joined overlapping areas" +msgstr "Spojené prekrývajúce sa plochy" + +#: ../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 "" +"Niektoré z ciest mali časť vzťahov (relations), ktoré boli zmenené. Prosím " +"overte či to nepredstavuje nejakú chybu." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +msgid "Enter values for all conflicts." +msgstr "Zadajte hodnoty pre všetky konflikty" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Riešenie konfliktov" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +msgid "Fix tag conflicts" +msgstr "Oprava konfliktu (rozporu) značiek" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +msgid "Removed Element from Relations" +msgstr "Odstránený Prvok z Relácií" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +msgid "Join Areas: Remove Short Ways" +msgstr "Spojiť plochy: Vymazať krátke cesty" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +msgid "Closed Way" +msgstr "Uzavretá cesta" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgid "Remove tags from inner ways" +msgstr "Vymazať značky z vnútorných ciest" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943 +msgid "Join Areas Function" +msgstr "Funkcie Spojenia Plôch (Join Areas Function)" #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 @@ -1048,4 +1146,46 @@ msgstr "Bez skratky" +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Jump To Position" +msgstr "Skok na miesto (pozíciu)" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Opens a dialog that allows to jump to a specific location" +msgstr "Otvoriť dialógové okno, aby bol umožnený skok na konkrétne miesto" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57 +msgid "Enter Lat/Lon to jump to position." +msgstr "Vložiť Šírku/Dĺžku pre skok na miesto." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 +msgid "You can also paste an URL from www.openstreetmap.org" +msgstr "Môžete tiež vložiť nejakú URL z www.openstreetmap.org" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 +msgid "Zoom (in metres)" +msgstr "Zväčšenie (v metroch)" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 +msgid "URL" +msgstr "URL" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 +msgid "Jump there" +msgstr "Skok tam" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 +msgid "Jump to Position" +msgstr "Skok na miesto (pozíciu)" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Could not parse Latitude, Longitude or Zoom. Please check." +msgstr "" +"Nemôžem zistiť Šírku, Dĺžku, alebo Zväčšenie(zoom). Prosím skontrolujte to." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Unable to parse Lon/Lat" +msgstr "Niesom schopný vyčítať Šírku/Dĺžku" + #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" @@ -1056,33 +1196,32 @@ msgstr "Zlúčiť aktuálnu vrstvu do inej vrstvy" +#: ../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 "Zlúčiť body" -#: ../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 "Zlúčiť body do najstaršieho bodu" -#: ../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 "Zvoľte minimálne dva body pre zlúčenie" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126 msgid "Abort Merging" msgstr "Zrušiť spojovanie" -#: ../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 "Kliknúť pre zrušenie spojovania bodov" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135 #, java-format msgid "" "Cannot merge nodes: Would have to delete way ''{0}'' which is still used." -msgstr "" -"Nemôžem spojiť body: Mám zmazať cestu ''{0}'' ktorá je ešte používaná." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264 +msgstr "Nemôžem spojiť body: Mám zmazať cestu ''{0}'' ktorá je ešte používaná." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231 #, java-format msgid "Merge {0} nodes" @@ -1465,6 +1604,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 "" "Zobraziť správu o stave s užitočnými informáciami, ktoré sa môžu viazať ku " @@ -1486,9 +1624,43 @@ #: ../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 "Zavrieť" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Zjednodušiť cestu" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Zmazať nepotrebné body z cesty." + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "Vyberte aspoň jednu cestu k zjednodušeniu." + +#: ../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] "Výber obsahuje {0} cestu. Naozaj ju chcete zjednodušiť?" +msgstr[1] "Výber obsahuje {0} cesty. Naozaj ich chcete zjednodušiť?" +msgstr[2] "Výber obsahuje {0} ciest. Naozaj ich chcete zjednodušiť?" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 +msgid "Are you sure?" +msgstr "Ste si istý?" + +#: ../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] "Zjednodušenie cesty (odstránenie {0} bodu)" +msgstr[1] "Zjednodušenie cesty (odstránenie {0} bodov)" +msgstr[2] "Zjednodušenie cesty (odstránenie {0} bodov)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1559,6 +1731,6 @@ msgstr "" "Funkcia umiestnená v relačnom člene bola skopírovaná do všetkých " -"nových ciest.
Mali by ste toto potvrdiť a opraviť to ak je to " -"potrebné." +"nových ciest.
Mali by ste toto potvrdiť a opraviť to ak je to potrebné." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377 @@ -1627,6 +1799,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 "" "* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo" @@ -1710,54 +1881,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 "Sťahujem dáta" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 msgid "No current dataset found" msgstr "Nájdená neaktuálna dátová sada" -#: ../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 "Nemôže byť nájdený objekt s id {0} v aktuálnej dátovej sade" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Update selection" msgstr "Aktualizovať výber" -#: ../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 "Aktualizovať aktuálne vybraté objekty zo servera (znovu nahrať dáta)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 msgid "Update Selection" msgstr "Aktualizácia výberu" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 msgid "There are no selected objects to update." msgstr "Pre aktualizáciu neboli vybrané žiadne objekty." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "Selection empty" msgstr "Výber je prázdny" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153 msgid "Update objects" msgstr "Aktualizovať objekty" -#: ../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 "Nahrať dáta" -#: ../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 "Nahrať všetky zmeny v aktívnej dátovej vrstve na OSM server" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 #, java-format msgid "" @@ -1768,35 +1939,35 @@ "vyriešte." -#: ../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 "Žiadne zmeny pre uloženie." -#: ../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 "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta." -#: ../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 "Synchronizovať iba {0} bod" -#: ../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 "Synchronizovať iba {0} cestu" -#: ../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 "Synchronizovať iba {0} reláciu" -#: ../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 "Synchronizovať celú dátovú sadu" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1804,40 +1975,37 @@ "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.
" +"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 "" "Aktualizácia neúspešná pretože server ná novú verziu " "jednu z
vaších bodov, ciest, alebo relácií.
Konflikt je zapríčinený " -"{0} s id {1},
server má verziu " -"{2},vaša verzia je {3}.

Click {4} pre synchronizáciu " -"iba sporných pôvodných.
Click {5} pre synchronizáciu " -"celej lokálnej dátovej sady so serverom.
Click {6} pre " +"{0} s id {1},
server má verziu {2}," +"vaša verzia je {3}.

Click {4} pre synchronizáciu iba " +"sporných pôvodných.
Click {5} pre synchronizáciu celej " +"lokálnej dátovej sady so serverom.
Click {6} pre " "zrušenie a pokračovanie v editácii.
" -#: ../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 +#: ../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 "Objavené konflikty" -#: ../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.
" +"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 "" "Nahrávanie neúspešné pretože server má novú verziu " -"jednu z
vašich bodov,ciest, alebo relácií.

Click " -"{0}pre synchronizáciu celej lokálnej dátovej sady so " -"serverom.
Click {1} pre zrušenie a pokračovanie v " -"editácii.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 +"jednu z
vašich bodov,ciest, alebo relácií.

Click {0}pre synchronizáciu celej lokálnej dátovej sady so serverom.
Click " +"{1} pre zrušenie a pokračovanie v editácii.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1850,22 +2018,22 @@ "existujúcim zmenovým súborom." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340 msgid "Changeset closed" msgstr "Zmenový súbor zavretý" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 msgid "Prepare conflict resolution" msgstr "Pripravujem rozhodnutie konfliktov" -#: ../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 "Kliknutím stiahnete všetky rodičovské cesty pre body {0}" -#: ../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 "Kliknutím zrušíte a pokračujete v editovaní mapy" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 #, java-format msgid "" @@ -1881,10 +2049,10 @@ "Dialog." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 msgid "Node still in use" msgstr "Bod je stále v užívaní" -#: ../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" @@ -1892,5 +2060,5 @@ "Varovanie: chybná hlavička \"{0}\" nenastala žiadna zhoda s očakávaným vzorom" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 msgid "Updating primitive" msgstr "Aktualizácia pôvodných" @@ -1902,6 +2070,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 "" @@ -1912,39 +2080,38 @@ "objekt a opakujem nahrávanie." -#: ../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 "objekt ''{0}'' je už zmazaný. Vynechávam objekt v nahrávaní." -#: ../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 "Nahrávam {0} objekty(ov) ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 -#, java-format -msgid "" -"Ignoring caught exception because upload is canceled. Exception is: {0}" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" msgstr "" "Ignorujem zachytenú výnimku pretože nahrávanie je zrušené. Výnimka je: {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44 msgid "Upload selection" msgstr "Nahrať výber" -#: ../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 "Nahrať všetky zmeny v aktuálnom výbere na OSM server." -#: ../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 "Kontrola rodičovských pre zmazané objekty" -#: ../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 "Čítanie rodičovských z ''{0}''" -#: ../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 "Kontrola pre zmazané rodičovské v lokálnej dátovej sade" @@ -2110,12 +2277,12 @@ "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 "" "Je tam {0} pôvodných vo vašej lokálnej dátovej sade, ktoré
ktoré by " "mohli byť zmazané zo servera. Ak pozdejšie skúsite zmazať, " -"alebo
aktualizovať ich server pravdepodobne " -"ohlási
konflikt.

Click {1}kontrola stavutýchto " -"pôvodných
na servery.
Click {2}ignorovať.
" +"alebo
aktualizovať ich server pravdepodobne ohlási
konflikt." +"

Click {1}kontrola stavutýchto pôvodných
na " +"servery.
Click {2}ignorovať.
" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183 @@ -2183,38 +2350,38 @@ msgstr "zvolené" -#: ../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 "Nemôžem pridať body ležiace mimo svet." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Pridať bod" -#: ../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 "Pridať bod do cesty" -#: ../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 "Pripojiť existujúcu cestu do bodu" -#: ../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 "Pridať nový bod do existujúcej cesty" -#: ../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 "Pridať bod do cesty a spojiť" -#: ../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 "Vytvoriť nový bod." -#: ../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 "Zvoliť bod pod kurzorom." -#: ../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." @@ -2224,14 +2391,14 @@ msgstr[2] "Vložiť nový bod do {0} ciest." -#: ../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 "Začiatok novej cesty z posledného bodu." -#: ../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 "Pokračovanie cesty z posledného bodu." -#: ../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 "Koniec kreslenia." @@ -2269,6 +2436,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 "" "Ťahajte \"play head\" a uvoľnite ho blízko miesta odkadiaľ chcete zvukový " @@ -2373,5 +2540,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." @@ -2433,6 +2600,6 @@ "type=, *=*, *=" msgstr "" -"type=* - kľúč 'type' s nejakou hodnotou. Skúste tiež " -"*=hodnota, type=, *=*, *=" +"type=* - kľúč 'type' s nejakou hodnotou. Skúste tiež *=hodnota, type=, *=*, *=" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 @@ -2452,6 +2619,6 @@ "type: - type of the object (node, way, relation)" msgstr "" -"type: - typy objektov (bod, cesta, " -"vzťah(relácia))" +"type: - typy objektov (bod, cesta, vzťah(relácia))" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 @@ -2460,12 +2627,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - všetky objekty nahraté užívateľom" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - objekt s určeným ID (0 pre nové objekty)" -#: ../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 "nodes:... - objekt s pridanými číslami bodov" -#: ../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-" @@ -2475,26 +2647,26 @@ "alebo značky:min-max)" -#: ../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 "modified - všetky zmenené objekty" -#: ../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 "selected - všetky vybraté objekty" -#: ../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 "incomplete - všetky nekompletné objekty" -#: ../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 "untagged - všetky neoznačené objekty" -#: ../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 "dieťa výraz - všetky deti objektov vyhovujúcich výrazu" -#: ../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" @@ -2502,18 +2674,17 @@ "rodič výraz - všetci rodičia objektov vyhovujúcich výrazu" -#: ../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 "Použite | alebo OR pri kombinácii s logickým \"alebo\"" -#: ../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 "" -"Použite \" ako úvodzovky (napríklad ak kľúč obsahuje dvojbodku)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +msgstr "Použite \" ako úvodzovky (napríklad ak kľúč obsahuje dvojbodku)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "Použite ( a ) k zoskupeniu výrazov" -#: ../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 @@ -2523,55 +2694,55 @@ msgstr "Filter" -#: ../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 "Hľadať" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Submit filter" msgstr "Predložiť filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "Start Search" msgstr "Začať vyhľadávanie" -#: ../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 "Neboli nájdené záznamy pre \"{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 "Nič nebolo pridané do výberu hľadaním \"{0}\"" -#: ../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 "Nič nebolo odstránené z výberu hľadaním \"{0}\"" -#: ../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 "Nič sa nenašlo vo výbere vyhľadávania pre ''{0}''" -#: ../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 "Najdených {0} zodpovedajúcich výrazov" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2584,5 +2755,5 @@ "{2}" -#: ../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 "" @@ -2590,10 +2761,10 @@ "použitia: kľúč=hodnota" -#: ../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 "Syntaktická chyba vzoru: Vzor {0} v {1} je nedovolený!" -#: ../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" @@ -2601,26 +2772,26 @@ "Neznámy pôvodný typ: {0}. Povolené hodnoty sú, body, cesty, alebo relácie" -#: ../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 "Neočakávaná značka: {0}" -#: ../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 "Chýbajúci argument pre \"alebo\"" -#: ../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 "Chýbajúci argument pre \"NOT\"" -#: ../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 "Očakávam uzatváraciu zátvorku." -#: ../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 "Zlý počet údajov(parametrov) pre operátor značiek." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674 #, java-format msgid "" @@ -2631,9 +2802,9 @@ "zo značiek alebo rozsahu, napríklad značky:1 alebo značky:2-5" -#: ../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 "Zlé číslo parametrov pre operátor bodov." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 #, java-format msgid "" @@ -2644,5 +2815,5 @@ "alebo rozsah bodov, napr. body:10-20" -#: ../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." @@ -2693,8 +2864,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" +#, fuzzy, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" msgstr "" "Varovanie: automatické skracovanie hodnôt a značiek ''{0}'' pri vymazávaní " @@ -2702,7 +2872,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2730,6 +2900,6 @@ "dependency." msgstr "" -"{0} relácie sa cyklujú(build a cycle) pretože odkazujú na nejaké " -"iné.
JOSM ich nemôže nahrať. Prosím upravte relácie a odstráňte cyklické " +"{0} relácie sa cyklujú(build a cycle) pretože odkazujú na nejaké iné." +"
JOSM ich nemôže nahrať. Prosím upravte relácie a odstráňte cyklické " "závislosti." @@ -2846,5 +3016,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 "Dvojitý konflikt" @@ -2865,5 +3035,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 "" @@ -2884,21 +3055,21 @@ msgstr "nemôžem vyriešiť nerozhodnutý konflikt" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 +#: ../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 "Údaj(parameter) ''{0}'' nesmie byť prázdny" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 msgid "At least one object to delete required, got empty collection" msgstr "" "Prázdna množina objektov, na zmazanie je potrebné vybrať aspoň jeden objekt" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:107 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 msgid "At least one object to delete requird, got empty collection" msgstr "" "Prázdna množina objektov, na zmazanie je potrebné vybrať aspoň jeden objekt" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177 #, java-format msgid "Delete {0} object" @@ -2908,5 +3079,5 @@ msgstr[2] "Zmazať {0} objektov" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2916,5 +3087,5 @@ msgstr[2] "Zmazať {0} bodov" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2924,5 +3095,5 @@ msgstr[2] "Zmazať {0} ciest" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2934,16 +3105,16 @@ #. 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?" +#: ../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 "" "Chystáte sa zmazať body mimo Vami stiahnutú oblasť.
Toto môže spôsobiť " -"problém iným objektom (nevidíte ich), ktoré môžu používať tieto " -"body.
Naozaj ich chcete zmazať?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +"problém iným objektom (nevidíte ich), ktoré môžu používať tieto body." +"
Naozaj ich chcete zmazať?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "Odstrániť potvrdenie" @@ -2962,15 +3133,15 @@ msgstr[2] "Posun {0} bodov" -#: ../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 "Očistený objekt ''{0}''" -#: ../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 "Očistené {0} objekty" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154 #, java-format msgid "" @@ -2981,5 +3152,5 @@ "je {1}" -#: ../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}" @@ -2990,10 +3161,4 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Rozhodnutie konfliktov v member list of relation {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "" -"Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná." #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3073,5 +3238,5 @@ msgstr "Použiť?" -#: ../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 " @@ -3137,5 +3302,5 @@ #, java-format msgid "Expected array of length 4, got {0}" -msgstr "" +msgstr "Očakávaná dĺžka sady 4. dostal som {0}" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:62 @@ -3153,5 +3318,5 @@ #, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "" +msgstr "Parameter ''{0}'' > 0.0 očakávaný, dostal som {1}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3230,9 +3395,9 @@ #, java-format msgid "" -"Preferences file had errors.
Making backup of old one to " -"
{0}
and creating a new default preference file." -msgstr "" -"Súbor preferencií mal chyby.
Vytváranie zo zálohy staršieho súboru " -"
{0}
a vytváranie nového východzieho súboru." +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." +msgstr "" +"Súbor preferencií mal chyby.
Vytváranie zo zálohy staršieho " +"súboru
{0}
a vytváranie nového východzieho súboru." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 @@ -3324,5 +3489,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3331,5 +3496,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3337,25 +3502,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 "J" #. 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 "S" #. 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 "Z" #. 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 "V" #: ../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 @@ -3367,6 +3532,5 @@ msgid "" "Unable to add primitive {0} to the dataset because it's already included" -msgstr "" -"Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté" +msgstr "Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté" #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623 @@ -3382,25 +3546,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 "Chýbajúci cieľ pre spojenie s cestou s id {0}" -#: ../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 "Chýba zlúčujúci ciel pre bod s id {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Chýba zlúčujúci ciel pre objekt s id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 -#, java-format -msgid "Missing merge target for node with id {0}" -msgstr "Chýba zlúčujúci ciel pre bod s id {0}" - -#: ../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 "Chýba zlúčujúci ciel pre reláciu s id {0}" -#: ../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}" @@ -3408,6 +3573,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 "" @@ -3473,24 +3638,24 @@ msgstr "F" -#: ../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 "očekávané id >= 0. Got {0}" -#: ../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 "pôvodné s id=0 nemôžu byť neviditeľné" -#: ../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 "ID > 0 očakávané. Got {0}" -#: ../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 "verzia > 0 očakávaná. Got {0}" -#: ../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 " @@ -3500,9 +3665,9 @@ "je" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941 #, java-format msgid "" "Can''t merge primitives with different ids. This id is {0}, the other is {1}" -msgstr "" +msgstr "Nemožno zlúčiť pôvodné s rozdielnymi id. Toto id je {0}, druhé je {1}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37 @@ -3532,6 +3697,6 @@ msgstr "Vytvorený užívateľ s rovnakým uid, ale rozdielnym menom" -#: ../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}." @@ -3544,5 +3709,5 @@ #, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "" +msgstr "Parameter ''{0}'' > 0 očakávaný, dostal som {1}" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3552,5 +3717,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 @@ -3562,6 +3726,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 "Nemôžem porovnať pôvodné s ID ''{0}'' s pôvodným s ID ''{1}''." @@ -3572,135 +3735,135 @@ msgstr "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}" -#: ../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 "Cesta označená ako plocha nie je uzavretá." -#: ../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 "Cesta v multipolygóne ''{0}'' nie je uzatvorená." -#: ../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 "Vymazaný člen ''{0}'' vo vzťahu (relation)." -#: ../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 "Cesta ''{0}'' s menej, než dvoma bodmi." -#: ../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 "Najdená viac než jedna \"from\" cesta." -#: ../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 "Najdené viac cieľových \"to\" ciest." -#: ../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 "Viac ako jedna \"via\" najdená." -#: ../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 "Neznáma funkcia ''{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 "Neznámy typ člena pre ''{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 "Nenajdená cesta \"from\"." -#: ../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 "Nenajdená cesta \"to\"." -#: ../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 "Nie je \"via\" bod alebo cesta najdená." -#: ../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 "Cesta \"from\" nezačína, ani nekončí v bode \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../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 "Táto \"to\" cesta nezačína a nekončí na \"via\" bode." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Táto \"from\" cesta nezačína a nekončí na \"via\" ceste." -#: ../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 "Táto \"to\" cesta nezačína a nekončí na \"via\" ceste." -#: ../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 "Štýl pre obmedzenie {0} nenajdený." -#: ../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 "Cesty ''{0}'' a ''{1}'' se pretínajú." -#: ../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 "Vnútorná(inner) cesta ''{0}'' je vonku." -#: ../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 "Neplatná funkcia ''{0}'' pre Cestu ''{1}''." -#: ../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 "Cesta v opačnom smere(Non-Way) ''{0}'' v multipolygóne." -#: ../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 "Multipolygón ''{0}'' nemá žiadnu vonkajšiu(obvodovú) cestu." -#: ../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 "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu." -#: ../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 "Označenie pre vonkajšiu(obvodovú) cestu ''{0}'' je zamenené." -#: ../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 "neoznačený" -#: ../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 "text" -#: ../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 "oblasť textu" -#: ../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 "Chyba: {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}" @@ -3712,5 +3875,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 @@ -3731,5 +3894,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 @@ -3750,5 +3913,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 "pozadie" @@ -3868,6 +4031,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 "Nemôžem čítať záložky z
''{0}''
Chyba bola: {1}" @@ -3882,5 +4044,5 @@ msgstr "Nezobrazovať v budúcnosti" -#: ../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 @@ -3888,32 +4050,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 "neúplný" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "komunikácie" -#: ../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 "železnica" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "vodný tok" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "využitie oblasti (landuse)" -#: ../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" @@ -3923,5 +4085,5 @@ msgstr[2] "{0} bodov" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -4174,15 +4336,14 @@ #, java-format msgid "Preference setting {0} has been removed since it is no longer used." -msgstr "" -"Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná." - -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +msgstr "Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná." + +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Súbor" -#: ../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 @@ -4196,19 +4357,19 @@ msgstr "Upraviť" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Zobraziť" -#: ../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 "Nástroje" -#: ../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 "Predvoľby" -#: ../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 @@ -4219,5 +4380,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Zvuk" @@ -4261,29 +4422,29 @@ msgstr "mierka" -#: ../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 "Zemepisná dĺžka na mieste kurzoru myši." -#: ../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 "Meno objektu na mieste kurzoru myši." -#: ../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 "Zemepisná šírka na mieste kurzoru myši." -#: ../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 "Uhol medzi predchádzajúcim a súčasným úsekom cesty." -#: ../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 "Bude zobrazená smerová šípka v segmente línie." -#: ../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 "Dĺžka nového nakresleného segmentu trasy bude zobrazená." -#: ../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 " @@ -4293,9 +4454,9 @@ "výber priamo z tohoto zoznamu s myšou.
" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(žiadny objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "Používateľ:" @@ -4361,6 +4522,6 @@ "relations." msgstr "" -"Prosím potvrdiť odstránenie {0} objektov z " -"{1} relácií." +"Prosím potvrdiť odstránenie {0} objektov z " +"{1} relácií." #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 @@ -4408,5 +4569,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" @@ -4415,5 +4576,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" @@ -4422,5 +4583,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" @@ -4439,5 +4600,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 @@ -4454,5 +4615,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" @@ -4528,22 +4689,22 @@ msgstr "Rozhodnutie konfliktov" -#: ../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 "aktuálny parameter je mimo rozsahu: got {0}" -#: ../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 "zoznam funkcií {0} sa teraz nenachádza v porovnávanej dvojici" -#: ../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 "neočakávaná hodnota parametra\"index\". Got {0}" -#: ../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." @@ -4630,6 +4791,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 "" "Kopírovať ich vybrané elementy na koniec zoznamu pre spojované elementy" @@ -4703,6 +4863,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" "Klik {0}pre začiatok spojovania mojich a ich " @@ -4712,9 +4872,9 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." -msgstr "" -"Klik {0}pre koniec spojovania mojich a ich " -"položiek" +"Click {0} to finish merging my and their entries." +msgstr "" +"Klik {0}pre koniec spojovania mojich a ich položiek" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 @@ -4764,6 +4924,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." -msgstr "" -"Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel" +msgstr "Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel" #. should not happen @@ -4776,6 +4935,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 "" "Nastala chyba počas komunikácie so serverom
Detaily: {0}" @@ -4811,7 +4970,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 "" "Sú tam {0} ďalšie pôvodné odkazy na reláciu {1}
ktoré sú zmazané na " @@ -4929,6 +5088,6 @@ msgstr "" "Držať sa vašej lokálnej verzie, JOSM
má resetnúť id pôvodných {0} " -"na 0.
Pri ďalšom nahrávaní serveru bude priraďovať
toto je nové " -"id.
Súhlasíte?" +"na 0.
Pri ďalšom nahrávaní serveru bude priraďovať
toto je nové id." +"
Súhlasíte?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 @@ -4950,6 +5109,6 @@ "dataset.
Do you agree?" msgstr "" -"JOSM odstráni vaše lokálne pôvodné s id {0}
z dátovej " -"sady.
Súhlasíte?" +"JOSM odstráni vaše lokálne pôvodné s id {0}
z dátovej sady." +"
Súhlasíte?" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 @@ -4966,5 +5125,5 @@ msgstr "Pôvodný" -#: ../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 "" @@ -5100,5 +5259,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 "Použiť" @@ -5200,7 +5359,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" @@ -5211,6 +5370,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" @@ -5245,7 +5404,5 @@ msgstr "Ešte nerozhodnuté" -#. --- 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 "Funkcia:" @@ -5274,6 +5431,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108 msgid "Enter a tag key, i.e. fixme" -msgstr "" -"Vložte kľúč značky, i.e. fixme" +msgstr "Vložte kľúč značky, i.e. fixme" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 @@ -5285,6 +5441,6 @@ "Enter a tag value, i.e. check members" msgstr "" -"Vložte hodnotu značky, i.e. kontrola " -"členov" +"Vložte hodnotu značky, i.e. kontrola členov" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123 @@ -5331,6 +5487,6 @@ msgid "Please select the values to keep for the following tags." msgstr "" -"Prisím vyberte ktoré hodnoty ponechať pre nasledujúce " -"značky(tags)." +"Prisím vyberte ktoré hodnoty ponechať pre nasledujúce značky(tags)." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 @@ -5346,11 +5502,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 msgid "Open a list of all commands (undo buffer)." -msgstr "" -"Otvorte prehľad všetkých príkazov (obnoviť vyrovnávaciu pamäť(buffer))" +msgstr "Otvorte prehľad všetkých príkazov (obnoviť vyrovnávaciu pamäť(buffer))" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 #: ../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 @@ -5419,17 +5574,15 @@ #, 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." -msgstr "" -"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 "" +"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." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 @@ -5503,18 +5656,18 @@ msgstr "Režim filter" -#: ../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 "História" -#: ../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 "Zobraziť históriu všetkých zobrazených objektov" -#: ../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 "Objekt s históriou(priebehom)" -#: ../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 @@ -5524,13 +5677,13 @@ msgstr "Znovu načítať" -#: ../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 "Znovu nahrať vybrané objekty a obnoviť zoznam." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303 msgid "Show" msgstr "Ukázať" -#: ../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 "Zobraziť históriu(priebeh) vybraných objektov." @@ -5726,5 +5879,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 "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne" @@ -5767,25 +5920,25 @@ msgstr "Priblížiť na výber" -#: ../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 "Sel.: Rel.:{0} / Cesty:{1} / Body:{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 "Výber" -#: ../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 "Výber: {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 "Uvoľniť panel" -#: ../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." @@ -5794,5 +5947,5 @@ "lište." -#: ../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 "Kliknite pre minimalizovanie/maximalizovanie obsahu panelu" @@ -5857,37 +6010,37 @@ msgstr "# Objekty" -#: ../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 "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na" -#: ../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 "Nahrať všetky deti relácií (rekurzívne)" -#: ../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 "Nahrať Všetky Deti" -#: ../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 "Nahrať vybraté relácie" -#: ../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 "Nahrať vybraté deti" -#: ../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 "Stiahnuť členov relácie" -#: ../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 "Konflikt v dátach" -#: ../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 "" @@ -5897,40 +6050,68 @@ "relácia dieťa
{0}
je na servery zmazaná.Nemôže byť načítaná." -#: ../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 "Relácia je zmazaná" -#: ../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 "Nahrávam reláciu {0}" -#: ../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 "" -"Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}" + +#: ../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] "Sťahovanie relácie ''{0}''" +msgstr[1] "Sťahovanie relácie ''{0}''" +msgstr[2] "Sťahovanie relácie ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Stiahnuť členov relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "Sťahovanie relácie ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148 msgid "Tags and Members" msgstr "Značky a Členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Parent Relations" msgstr "Nadradené vzťahy" -#: ../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 "Relácia dieťa" -#: ../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 "Použiť Funkciu" + +#: ../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 "Vložiť funkcie pre všetkých členov relácie" + +#: ../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?" +"relation itself.
This creates circular dependencies and is discouraged." +"
How do you want to proceed with circular dependencies?" msgstr "" "Je tam aspoň jeden člen odkazujúci na túto reláciu
na vlastnú " @@ -5938,29 +6119,29 @@ "chcete pokračovať s kruhovou závislosťou?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570 msgid "Remove them, clean up relation" msgstr "Odstraňte ich, vyčistite reláciu" -#: ../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 "Ignorujte ich, nechajte reláciu tak ako je" -#: ../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?" +"primitive ''{0}''

Do you really want to add another relation member?" msgstr "" "Táto relácia už má jedného alebo viac členov odkazujúcich " -"na
pôvodné ''{0}''

Skutočne chcete pridať ďalšieho relačného " -"člena?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 +"na
pôvodné ''{0}''

Skutočne chcete pridať ďalšieho relačného člena?" +"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 msgid "Multiple members referring to same primitive" msgstr "Viacnásobné členy odkazujú na rovnaké obecné" -#: ../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 "" @@ -5972,5 +6153,5 @@ "odkazy a je preto znechutený.
Vynechanie relácie ''{0}''." -#: ../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" @@ -5978,5 +6159,5 @@ "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade pred prvým členom" -#: ../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" @@ -5984,5 +6165,5 @@ "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade za posledným členom" -#: ../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 " @@ -5992,5 +6173,5 @@ "členom" -#: ../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 " @@ -6000,21 +6181,20 @@ "členom" -#: ../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 "" -"Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných" +msgstr "Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných" #. 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 "Editor Relácií: Odstrániť Vybrané" -#: ../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 "Vybrať člena relácie, ktorý sa týka pôvodných v aktuálnom výbere" -#: ../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 "" @@ -6024,66 +6204,69 @@ "Vybrať člena relácie, ktorý odkazuje na {0} pôvodných v aktuálnom výbere" -#: ../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 "Výber pôvodných pre vybraté členy relácie" -#: ../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 "Triedenie členov relácie" -#. 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 +msgid "Sort" +msgstr "Triediť" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874 msgid "Relation Editor: Sort" msgstr "Editor Relácií: Triedenie" -#: ../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 "Pridať všetky zvolené objekty medzi členy" #. 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 "Editor Relácií: Posun Hore" -#: ../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 "Presunúť zvolenú vrstvu o riadok dolu." #. 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 "Editor Relácií: Posun Dole" -#: ../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 "Odstrániť práve vybraté členy z tejto relácie" #. 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 "Editor Relácií: Odstrániť" -#: ../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 "Vymazať práve vydanú reláciu" -#: ../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 "Áno, vyriešiť konflikt a zavrieť" -#: ../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 "Kliknutie vytvorí konflikt a zatvorí editor tejto relácie" -#: ../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 "Nie, pokračovať v editácii" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../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 "Kliknutie navráti editor relácie a pokračuje v editovaní relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6092,58 +6275,65 @@ msgstr "" "Táto relácia bola zmenená zvonku z editoru.
Nemôžete použiť zmeny " -"pokračovať v editácii.

Chcete vyriešiť konflikt a zavrieť " -"editor?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 +"pokračovať v editácii.

Chcete vyriešiť konflikt a zavrieť editor?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 msgid "Conflict in data" msgstr "Konflikt v dátach" -#: ../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." +#: ../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 "" "Vrstva ''{0}'' už mala konflikt pre pôvodné
''{1}''.
Prosím " "rozhodnite najskôr tento konflikt, potom skúste znovu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 msgid "Apply the current updates" msgstr "Použiť súčasnú aktuálizáciu" -#: ../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 "Použiť aktualizácie a zavrieť dialógové okno" -#: ../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 "Zrušiť(nepoužiť) aktualizácie a zavrieť dialógové okno" -#: ../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 "Pridať prázdnu značku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 -msgid "Download all incomplete ways and nodes in relation" -msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#, fuzzy +msgid "Download all incomplete members" +msgstr "Stiahnuť členov relácie" + +#: ../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 "Stiahnuť členov" -#: ../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 "Editor Relácií: Sťahovanie Členov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#, fuzzy +msgid "Download selected incomplete members" +msgstr "Stiahnuť členov relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258 msgid "Sets a role for the selected members" msgstr "Nastavenie funkcie pre vybrané členy" -#: ../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 "Použiť Funkciu" -#: ../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 "" @@ -6153,44 +6343,37 @@ msgstr "" "Nastavujete prázdnu funkciu na {0} pôvodných.
Toto sa rovná " -"vymazaniu funkcie z týchto pôvodných.
Skutočne chcete použiť novú " -"funkciu?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +"vymazaniu funkcie z týchto pôvodných.
Skutočne chcete použiť novú funkciu?" +"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278 msgid "Yes, apply it" msgstr "Áno, Použiť to" -#: ../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 "Nie, použite to" -#: ../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 "Potvrdiť prázdnu funkciu" -#: ../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 "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na" -#. download the relation -#. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 -#, java-format -msgid "Downloading relation ''{0}''" -msgstr "Sťahovanie relácie ''{0}''" - -#: ../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 "Zväčšiť na" -#: ../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 "Zväčšovanie je vypnuté pretože vrstva z tejto relácie nie je aktívna" -#: ../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 "Zväčšovanie je vypnuté pretože nie je vybratý člen" @@ -6212,6 +6395,5 @@ #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" -msgstr "" -"Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}" +msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63 @@ -6231,19 +6413,19 @@ msgstr "Načítať aktuálne vybranú reláciu" -#: ../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 "Použiť zmeny" -#: ../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 "Vytvoriť novú reláciu vo vrstve \"{0}\"" -#: ../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 "Upraviť novú reláciu vo vrstve \"{0}\"" -#: ../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}''" @@ -6255,6 +6437,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 "" "Varovanie: ignorovanie výnimky pretože úloha bola zrušená. Výnimka bola: " @@ -6443,11 +6624,10 @@ #, java-format msgid "" -"Neither {0} nor {1} is " -"enabled.
Please chose to either download OSM data, or GPX data, or " -"both." -msgstr "" -"Žiadny {0} ani {1} je " -"umožnený.
Prosím vybrať pre jedny sťahované OSM dáta, alebo GPX dáta, " -"alebo oba." +"Neither {0} nor {1} is enabled." +"
Please chose to either download OSM data, or GPX data, or both." +msgstr "" +"Žiadny {0} ani {1} je umožnený." +"
Prosím vybrať pre jedny sťahované OSM dáta, alebo GPX dáta, alebo oba." #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80 @@ -7219,5 +7399,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 @@ -7457,6 +7637,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 "" @@ -7466,6 +7646,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 "" @@ -7607,6 +7787,5 @@ "Failed to set current primitive. Current version {0} not available in " "history." -msgstr "" -"chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu" +msgstr "chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:52 @@ -7617,15 +7796,15 @@ #, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "" +msgstr "Parameter ''{0}'' > 0 očakávaný. Dostal som {1}." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 #, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "" +msgstr "id s parametrom ''{0}'' > 0 očakávaný. dostal som {1}." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 #, java-format msgid "Object id > 0 expected. Got {0}" -msgstr "" +msgstr "Objekt id > 0 očakávaný. Dostal som {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:180 @@ -7726,6 +7905,6 @@ "Version {0} currently edited in layer ''{1}''" msgstr "" -"Verzia {0} aktuálne upravovaná vo vrstve " -"''{1}''" +"Verzia {0} aktuálne upravovaná vo vrstve ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 @@ -7740,13 +7919,13 @@ msgstr "anonymný" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 msgid "Changeset info" msgstr "Info súboru zmien" -#: ../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 "Uvedený prehliadač s informáciou o súbore zmien" -#: ../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}" @@ -7847,6 +8026,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 "Vrstva ''{0}'' obsahuje zmeny ktoré, by mali byť nahraté na server." @@ -7940,18 +8118,18 @@ 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] "" -"{0} vrstvy sa musia uložiť, pretože nemajú pričlenené " -"súbory.
Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte " -"zmeny.
Vrstvy bez súborov:" +"{0} vrstvy sa musia uložiť, pretože nemajú pričlenené súbory." +"
Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte zmeny.
Vrstvy " +"bez súborov:" msgstr[1] "" "{0} vrstva sa musí uložiť, pretože nemá pričlenený súbor.
Najskôr " -"vyberte súbor pre túto vrstvu, alebo zrušte zmeny.
Vrstva bez " -"súboru:" +"vyberte súbor pre túto vrstvu, alebo zrušte zmeny.
Vrstva bez súboru:" msgstr[2] "" -"{0} vrstiev sa musí uložiť, pretože nemajú pričlenené " -"súbory.
Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte " -"zmeny.
Vrstvy bez súborov:" +"{0} vrstiev sa musí uložiť, pretože nemajú pričlenené súbory." +"
Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte zmeny.
Vrstvy " +"bez súborov:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223 @@ -7963,6 +8141,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 " @@ -8012,6 +8190,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." -msgstr "" -"Ukončiť JOSM s uložením. Neuložené zmeny budú nahrané a/alebo uložené" +msgstr "Ukončiť JOSM s uložením. Neuložené zmeny budú nahrané a/alebo uložené" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 @@ -8021,6 +8198,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." -msgstr "" -"Uložiť/Nahrať vrstvy pred vymazaním. Neuložené zmeny nebudú stratené." +msgstr "Uložiť/Nahrať vrstvy pred vymazaním. Neuložené zmeny nebudú stratené." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 @@ -8029,5 +8205,5 @@ msgstr "Pripravujem vrstvu ''{0}'' pre nahrávanie ..." -#: ../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 " @@ -8037,5 +8213,5 @@ "úpravami
bola zrušená alebo skončila neúspechom." -#: ../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 "Neúplné nahratie a/alebo uloženie" @@ -8108,40 +8284,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 "Nahrať" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 msgid "Settings" msgstr "Nastavenia" -#: ../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 "Rozhodnite sa ako nahrať dáta a ktoré zmenové dáta použiť" -#: ../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 "Značky pre nový súbor zmien" -#: ../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 "Použité značky pre dáta zmenovúho súboru sú nahraté do" -#: ../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 "Pridané objekty:" -#: ../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 "Upravené objekty:" -#: ../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 "Odstránené objekty:" -#: ../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:" @@ -8151,5 +8327,5 @@ msgstr[2] "{0} pridaných objektov:" -#: ../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:" @@ -8159,5 +8335,5 @@ msgstr[2] "{0} objektov na úpravy:" -#: ../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:" @@ -8167,71 +8343,67 @@ msgstr[2] "{0} zmazaných objektov:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494 msgid "Upload Changes" msgstr "Nahrať zmeny" -#: ../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 "Nahrať zmenené pôvodné" -#: ../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 "" -"Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 +msgstr "Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503 msgid "Illegal upload comment" msgstr "Neplatná poznámka nahrávania" -#: ../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 "Prosím najskôr zadajte požadované koordináty." + +#: ../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 "Zrušiť nahrávanie a pokračovať v editácii" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 -msgid "Upload all changes in one request" -msgstr "Nahrať všetky zmeny v jednej požiadavke" - -#: ../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 "" -"Umožniť nahranie všetkých zmien v jednej požiadavke, vypnúť použitie jednej " -"požiadavky na zmenené pôvodné" - -#: ../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 "Doplniť krátky komentár k nahrávaným zmenám" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660 msgid "Enter an upload comment (min. 3 characters)" msgstr "Doplnte nejaký komentár pre nahrávanie (min. 3 znaky)" -#: ../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 "Otvoriť nový zmenový súbor" -#: ../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 "Otvoriť nový zmenový súbor a použiť ho v ďalšom nahrávaní" -#: ../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 "Použiť a otvoriť zmenový súbor" -#: ../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 "Nahrať dáta do už otvoreného zmenového súboru" -#: ../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 "zatvoriť zmenový súbor po nahratí" -#: ../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 "Vybrať na zavretie zmenový súbor po ďalšom nahratí" -#: ../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}" @@ -8239,16 +8411,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 "Nahrať obsah z vašich otvorených zmenových súborov zo servera" -#: ../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 "Zatvoriť práve vybratý otvorený zmenový súbor" -#: ../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}." @@ -8256,6 +8428,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 "" @@ -8266,5 +8438,5 @@ "pôvodných a zopakovanie nahratia." -#: ../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 "Pripravujem pôvodné na nahratie ..." @@ -8298,112 +8470,58 @@ msgstr "Pokračovať v nahrávaní" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Obrázky pre {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "Čítať GPX..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Žiadny čas pre bod {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 "Nedá sa prečítať čas \"{0}\" z bodu {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 "Čítam {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Nenájdené žiadne obrázky s časovými značkami." - -#: ../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 "Obrázky s GPS súradnicami" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "Štart GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "Koniec GPS: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "súčastná odchylka: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "rozdiel časových pásiem: " - -#: ../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] "obrázok" -msgstr[1] "obrázky" -msgstr[2] "obrázkov" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} vo vnútry stopy (track)." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Synchronizovať hodiny" - -#: ../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 "JPEG obrázky (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "Dáta v súbore \"{0}\" nemohli byť parsované." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "V súbore \"{0}\" nie je časová značka EXIF" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Obrázok" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "Časová zóna GPS zariadenia (rozdiel od fotografie)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Synchronizovať čas s GPS zariadením" - -#: ../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 "Zadaný čas nemôže byť rozparsovaný" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86 +#, fuzzy, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "VAROVANIE: neúspešný pri pokračovaní preferancií na ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71 +#, fuzzy +msgid "Upload data in one request" +msgstr "Nahrať všetky zmeny v jednej požiadavke" + +#: ../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 +#, fuzzy +msgid "(1 request)" +msgstr "Chybná požiadavka" + +#: ../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} metrov" +msgstr[1] "{0} metrov" +msgstr[2] "{0} metrov" + +#: ../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 "Prosím vložte vybraný reťazec" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265 +#, fuzzy, java-format +msgid "Value ''{0}'' is not a number. Please enter an integer > 1" +msgstr "Súbor ''{0}'' nie je zapisovateľný. Prosím zvoľte iné meno súboru." + +#: ../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 @@ -8411,30 +8529,30 @@ msgstr "gps poloha bodu" -#: ../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 "Prispôsobiť kresliacu trasu" -#: ../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 "Použíť globálne nastavenie." -#: ../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 "Kresliť spojnice medzi bodmi v tejto vrstve" -#: ../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 "Nekresliť spojnice mezi bodmi v tejto vrstve" -#: ../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 "Výber nastavenia kreslenej čiary" -#: ../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 @@ -8442,5 +8560,5 @@ msgstr "Prispôsobiť farbu" -#: ../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 @@ -8449,5 +8567,5 @@ msgstr "Predvolené" -#: ../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 @@ -8456,58 +8574,67 @@ msgstr "Zvoľte farbu" -#: ../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 "Značky z pomenovaných bodov" -#: ../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 "Pomenovanie trackpoints od {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215 msgid "Import Audio" msgstr "Importovať zvuk" -#: ../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 "" +"Údaje v GPX vrstve ''{0}'' boli stiahnuté zo servera.
Pretože body " +"cesty neobsahujú časovú značku nemôžme ich zladiť s audio dátami." + +#: ../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 +msgstr "Import nie je možný" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248 msgid "Wave Audio files (*.wav)" msgstr "Wave Audiosúbory (*.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 "Zukové značky z {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 "Importovať obrázky" -#: ../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 "" +"Údaje v GPX vrstve ''{0}'' boli stiahnuté zo servera.
Pretože body " +"cesty neobsahujú časovú značku nemôžme ich zladiť s obrázkami." + +#: ../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 "JPEG obrázky (*.jpg)" + +#: ../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 "Meno: {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 @@ -8515,5 +8642,5 @@ msgstr "Popis: {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" @@ -8524,5 +8651,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 @@ -8530,22 +8657,17 @@ msgstr "Popis" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 msgid "Timespan" msgstr "Časový interval" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 msgid "Length" msgstr "Dĺžka" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 -msgid "URL" -msgstr "URL" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443 msgid "Length: " msgstr "Dĺžka: " -#: ../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, " @@ -8555,5 +8677,5 @@ msgstr[2] "{0} trás, " -#: ../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" @@ -8563,24 +8685,24 @@ msgstr[2] "{0} waypointov (bodov cesty)" -#: ../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 "Konvertovať do dátovej vrstvy" -#: ../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:" +#: ../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 "" "Nahrať nespracované GPS dáta, ako mapové dáta je nežiadúce.
K " "chcete nahrať stopy (traces), pozrite sem:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8590,29 +8712,29 @@ msgstr "Prevedené z: {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 "Stiahnuť z OSM okolie tejto stopy (track)" -#: ../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 "Stiahnuť všetko vo vnútry:" -#: ../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} metrov" -#: ../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 "Maximálna plocha na požiadavku:" -#: ../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} štvorcových km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8620,12 +8742,12 @@ "wish
to continue?" msgstr "" -"Táto akcia bude potrebovať
{0} samostatných stiahnutí " -"dát.
Chcete pokračovať?" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 +"Táto akcia bude potrebovať
{0} samostatných stiahnutí dát." +"
Chcete pokračovať?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 msgid "No GPX track available in layer to associate audio with." msgstr "Vo vrstve nie je žiadna GPX stopa ku ktorej by sa dal pripojiť zvuk." -#: ../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 " @@ -8635,5 +8757,5 @@ "alebo za koncom, boli vynechané, alebo presunuté na začiatok." -#: ../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 " @@ -8643,23 +8765,23 @@ "ich času boli vynechané." -#: ../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 "Údajová vrstva {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 "mimo ukladanej oblasti" -#: ../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 "verzia {0}" -#: ../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 "Varovanie: miešanie 0.6 a 0.5 dátového výsledku vo verzii 0.5" -#: ../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." @@ -8669,5 +8791,5 @@ msgstr[2] "Bolo tam zistených {0} konfliktov." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339 #, java-format msgid "" @@ -8688,5 +8810,5 @@ "objektov
z miestnej dátovej sady, pretože bol zmazaný na servery." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348 #, java-format msgid "" @@ -8706,11 +8828,11 @@ "List Dialog a manuálne ich vyriešte." -#: ../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 "Kliknutím zavriete tento dialóga pokračujete v editovaní" -#: ../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" @@ -8720,32 +8842,32 @@ msgstr[2] "{0} vymazaných" -#: ../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} se skladá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 msgid "unset" msgstr "neuršený (unset)" -#: ../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 "Verzia API: {0}" -#: ../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 "Previesť do GPX vrstvy" -#: ../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 "Test konzistencie dátovej sady" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 msgid "No problems found" msgstr "Nezistený žiadny problém" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 msgid "Following problems found:" msgstr "Bol najdený nasledujúci problém:" @@ -8753,6 +8875,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 "" "Nahrať z nerozdelených GPS dát ako mapových dát je nepremyslene " @@ -8798,4 +8920,360 @@ msgstr[2] "{0} bodov" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "Súbory GPX (*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "Súbor {0} je ešte nahratý pod menom \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#, java-format +msgid "Error while parsing {0}" +msgstr "Chyba pri rozkladaní {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Nemôžem čítať \"{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 "" +"Urobte fotku Vášho GPS zariadenia keď ukazuje čas.
Zobrazte fotku." +"
Potom len zapíšte čas ktorý vidíte na fotke a vyberte časovú zónu.
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Čas fotografie (z exif):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "GPS čas (čítaj nad fotografiou) " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [dd/mm/yyyy hh:mm:ss]" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +msgid "I'm in the timezone of: " +msgstr "Som v časovej zóne: " + +#: ../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 "Žiaden dátum" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "Otvoriť inú fotografiu" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +msgid "Synchronize time from a photo of the GPS receiver" +msgstr "Synchronizovať čas z fotky a GPS prímača" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"Chyba pri rozkladaní (parsovaní) dát.\n" +"Prosím použite požadovaný formát." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "Neplatný dátum" + +#: ../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 "GPX stopa(trasa): " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Otvoriť inú GPX stopu(trasu)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +msgid "Timezone: " +msgstr "Časové pásmo: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +msgid "Offset:" +msgstr "Vyrovnať(Offset):" + +#: ../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 "" +"Môžem použiť obrázok z môjho GPS prímača.
Môže toto pomôcť?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 +msgid "Update position for: " +msgstr "Aktualizovať pozíciu pre: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 +msgid "All images" +msgstr "Všetky obrázky" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 +msgid "Images with no exif position" +msgstr "Obrázky bez exif pozície" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 +msgid "Not yet tagged images" +msgstr "Zatiaľ neoznačkované obrázky" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +msgid "Correlate images with GPX track" +msgstr "Zladiť obrázky s GPX stopou(track)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Correlate" +msgstr "Zladiť" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Auto-Guess" +msgstr "Auto-Guess" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +msgid "You should select a GPX track" +msgstr "Môžete vybrať GPX stopu(track)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "Nevybratá GPX stopa(track)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Chyba pri rozkladaní časového pásma.\n" +"Čakám na formát: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +msgid "Invalid timezone" +msgstr "Neplatné časové pásmo" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Chyba pri rozkladaní vyrovnania(offset).\n" +"Čakám na formát: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +msgid "Invalid offset" +msgstr "Neplatné vyrovnanie (offset)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "Najdené {0} zhody z {1} v GPX stope {2}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "Nahratá GPX stopa(trasa)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 +msgid "The selected photos don't contain time information." +msgstr "Vybraté fotografie neobsahujú informácie o čase." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 +msgid "Photos don't contain time information" +msgstr "Fotografie neobsahujú informácie o čase." + +#: ../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 "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "GPX Stopa nemá informáciu o čase." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "Časové pásmo: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "Minút: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "Sekúnd: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Zladené {0} z {1} fotiek k GPX stope." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "(Časový rozdiel z {0} dní)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "Vyrovnanie rozdielu medzi stopou(track) a fotkami: {0}m {1}s" + +#: ../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 "" +"Chyba nastala zatiaľ čo sa snažím dať fotky do GPX trasy. Musíte nastaviť " +"posúvač ručne na fotky." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869 +msgid "Matching photos to track failed" +msgstr "Priraďovanie fotiek ku stope(track) zlyhalo" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +msgid "Adjust timezone and offset" +msgstr "Nastaviť časové pásmo a vyváženie(offset)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +msgid "Default Values" +msgstr "Východzie hodnoty" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +msgid "Extracting GPS locations from EXIF" +msgstr "Získavam GPS polohu z EXIF" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +msgid "Starting directory scan" +msgstr "Začínam prehľadávať adresár" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135 +msgid "One of the selected files was null" +msgstr "Niektorý z vybratých súborov bol prázdny" + +#: ../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 "Čítať fotky..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "Čítam {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 "Nemôžem získať cestu pre adresár {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "Prehľadávam adresár {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "Nájdený prázdny súbor v adresári {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Chyba pri získavaní súború z adresára {0}\n" + +#: ../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 "Obrázky s GPS súradnicami" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "Zladiť GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "obrázok" +msgstr[1] "obrázky" +msgstr[2] "obrázkov" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "{0} boli nájdené s gps značkami." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +msgid "No image" +msgstr "Bez obrázka" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "Nahrávam {0}" + +#: ../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 "Chyba v súbore {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Zobraziť fotky s geoznačkami" + +#: ../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 "Predchádzajúci" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Odstraniť fotku z vrstvy" + +#: ../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 "Nasledujúci" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "Stredový pohľad" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +msgid "Zoom best fit and 1:1" +msgstr "Najvhodnejšie zväčšenie 1:1" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#, java-format +msgid "" +"\n" +"Altitude: {0} m" +msgstr "" +"\n" +"Výška: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8886,6 +9364,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 msgid "There was an error while trying to display the URL for this marker" -msgstr "" -"Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky" +msgstr "Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 @@ -9118,5 +9595,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 @@ -9314,6 +9791,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 "" "Nakreslite smerové šípky použijúc vyhľadávajúcu tabuľku namiesto " @@ -9380,6 +9856,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 "" "Aplikovať vyhladzovanie (antialiasing) v mape pre jemnejšie zobrazenie." @@ -9393,6 +9868,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw virtual nodes in select mode for easy way modification." -msgstr "" -"Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie." +msgstr "Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie." #. background layers in inactive color @@ -9449,19 +9923,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 "Vzhľad a chovanie" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Jazyk" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113 +msgid "Looking up available translations..." +msgstr "Vyhľadávanie dostupných prekladov..." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196 msgid "Default (Auto determined)" msgstr "Štandardný (Automatická predvoľba)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Jazyk" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:112 -msgid "Looking up available translations..." -msgstr "Vyhľadávanie dostupných prekladov..." #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35 @@ -9720,6 +10194,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 "" "Neúspešné načítanie obsahu zdrojov štýlov z
''{0}''.

Detaily " @@ -9731,4 +10205,5 @@ msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" msgstr "" +"Varovanie: neplatný formát počtu v štýle obsahu ''{0}''. Dostal som ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39 @@ -9787,6 +10262,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 "" "

Okrem toho, skratky sú aktivované, keď sú prvýkrát priradené k tlačítku v " @@ -9803,9 +10278,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 "" "

Ako ste si mohli všimnúť, že výber kláves ktorý ponúka ďalšia strana sa " @@ -9844,6 +10318,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 "

Pseudo-modifikátor 'vypnutý' vypnúť skratku pri konflikte.

" @@ -9937,5 +10411,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 "Viac informácii o tejto vlastnosti" @@ -10023,5 +10497,5 @@ msgstr "Sťahujem body {0} až {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 @@ -10029,5 +10503,5 @@ msgstr "Neúspešné rozloženie údajov ''{0}'' odpovedal server." -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -10035,4 +10509,6 @@ "''{0}''" msgstr "" +"Nečakaný chybný formát záhlavia pre konflikt v aktualizácii súboru zmien. " +"Dostal som ''{0}''" #. SAXException does not chain correctly @@ -10149,16 +10625,15 @@ msgstr "Neznámy mód {0}." -#: ../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." +#: ../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 "" "žiadne pôvodné s id {0} v lokálnej dátovej sade. Nemôžem dedukovať typ " "pôvodných" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../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 @@ -10187,20 +10662,20 @@ "Server odpovedal stretol sa s reakcoiu kódu 404 pre id {0}. Vynechanie." -#: ../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 "Priniesť(Fetching) balíček bodov z {0}" -#: ../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 "Priniesť(Fetching) balíček ciest z {0}" -#: ../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 "Priniesť(Fetching) balíček relácií z {0}" -#: ../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 " @@ -10209,4 +10684,12 @@ "Server odpovedal s chybovou kód 404, opakovanie s individuálnou žiadosťou " "pre každý pôvodný" + +#: ../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] "Sťahovanie relácie ''{0}''" +msgstr[1] "Sťahovanie relácie ''{0}''" +msgstr[2] "Sťahovanie relácie ''{0}''" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -10248,5 +10731,5 @@ msgstr "preferencie ''{0}'' chýbajú. Nemôžem inicializovať OsmApi" -#: ../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 "" @@ -10254,25 +10737,25 @@ "nastaveniach." -#: ../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}." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#, fuzzy, java-format +msgid "" +"It supports protocol version 0.6, while the server says it supports {0} to " +"{1}." msgstr "" "Podporuje protokol verzií 0.5 a 0.6, zatiaľ čo server hlási podporu {0} to " "{1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Komunikácia s {0} je ustálená, používa protokol verzie {1}" -#: ../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 "neočakávaný formát z id odpovedi zo servera, dostáva ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 #, java-format msgid "" @@ -10282,66 +10765,66 @@ "''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 msgid "Creating changeset..." msgstr "Vytváranie súboru zmien..." -#: ../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 "Úspešne otvorený súbor zmien {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335 msgid "Updating changeset..." msgstr "Aktualizácia súboru zmien..." -#: ../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 "Aktualizácia súboru zmien {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 msgid "Closing changeset..." msgstr "Zatváranie súboru zmien..." -#: ../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 "Nenachádza sa tu súbor zmien pre diff nahratie" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 msgid "Preparing..." msgstr "Pripravujem..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Nahrávam..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Waiting 10 seconds ... " msgstr "Čakanie 10 sekúnd ... " -#: ../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 "Začiatok opakovania {0} z {1} v {2} sekunde ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434 msgid "OK - trying again." msgstr "OK - skúšam znovu." -#: ../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 "Spúšťam opakovanie {0} z {1}." -#: ../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 "Aktuálny zmenový súbor ja prázdny. Nemôžem nahrať dáta." -#: ../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 "ID z aktuálneho zmenového súboru > 0 požadovaný. Aktuálne ID je {0}." -#: ../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}." @@ -10376,5 +10859,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}''." @@ -10401,5 +10884,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}." @@ -10407,5 +10890,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}" @@ -10418,5 +10901,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}''." @@ -10475,11 +10958,11 @@ #: ../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." -msgstr "" -"Varovanie: Heslo je uložené v jednoduchom texte v súbore " -"nastavení.
Heslo je prenesené v jednoduchom texte na server, kódované v " -"URL.
Nepoužite vzácne Heslo." +"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 "" +"Varovanie: Heslo je uložené v jednoduchom texte v súbore nastavení." +"
Heslo je prenesené v jednoduchom texte na server, kódované v URL." +"
Nepoužite vzácne Heslo." #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 @@ -10507,9 +10990,9 @@ #, java-format msgid "" -"An error occurred while restoring backup file.
Error " -"is:
{0}" -msgstr "" -"Nejaká chyba nastala počas obnovy záložného súboru.
Chyba je: " -"
{0}" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" +"Nejaká chyba nastala počas obnovy záložného súboru.
Chyba je:
" +"{0}" #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113 @@ -10582,51 +11065,50 @@ msgstr "Súbor \"{0}\" neexistuje" -#: ../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 "" -"Chýbajúce povinné vlastnosti pri prvku ''hranice''. Got " -"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." - -#: ../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 "" +"Chýbajúce povinné vlastnosti pri prvku ''hranice''. Got minlon=''{0}''," +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Found XML element not as direct child of element ." msgstr "" "vytvoriť XML element element nie je ako priame dieťa z elementu " -#: ../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 "Chýba povinná vlastnosť ''{0}'' na z cesty {1}" -#: ../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 "Neplatná hodnota vlastnosti ''ref'' z elementu . Got {0}" -#: ../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 "" "Vytvoriť XML element <člen> nie je ako priame dieťa z elementu " -#: ../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 "Chýba vlastnosť ''ref'' pre člena v relácii {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 -#, java-format -msgid "" -"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" +#: ../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 "" "Neplatná hodnota pre vlastnosť ''ref'' pre člena v relácii {0}. Got {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Chýba vlastnosť ''type'' pre člena {0} v relácii {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277 #, java-format msgid "" @@ -10635,19 +11117,19 @@ "Neplatná hodnota vre vlastnosť ''type'' pre člena {0} v relácii {1}. Got {2}." -#: ../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 "Nekompletné špecifikácie s ref=0" -#: ../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 "Nedefinovaný prvok ''{0}'' najdený vo vstupných dátach. Vynechávam." -#: ../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 "Neplatný objekt s 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 "" @@ -10658,8 +11140,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 "" @@ -10671,25 +11153,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 "Neznáma, alebo nepodporovaná API verzia. Got {0}" -#: ../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 "Chýba vlastnosť ''verzia'' na OSM pôvodných s id {0}" -#: ../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 "Chýba povinná vlastnosť ''{0}''." -#: ../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 "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428 #, java-format msgid "" @@ -10698,5 +11180,5 @@ "Cesta s externou ID ''{0}'' obsahuje chýbajúci bod s externou ID ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10707,5 +11189,5 @@ "chýbajúci v nahratých dátach a je preto neúplná tiež." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10713,5 +11195,5 @@ msgstr "Neznámy typ relačného člena ''{0}'' v relácii s eterným id ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10722,13 +11204,13 @@ "''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:554 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557 msgid "Prepare OSM data..." msgstr "Pripravujem OSM údaje..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558 msgid "Parsing OSM data..." msgstr "Rozložiť OSM dáta..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563 msgid "Preparing data set..." msgstr "Pripravujem dátový súbor ..." @@ -10781,4 +11263,10 @@ msgid "Contacting Server..." msgstr "Kontaktujem server..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 +#, fuzzy, java-format +msgid "Expected value > 0 for parameter ''{0}'', got {1}" +msgstr "neočakávaná hodnota parametra\"index\". Got {0}" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10819,48 +11307,45 @@ "Chybná hodnota pre vlastnosť ''{0}'' na XML značke(tag) ''{1}''. Got {2}" -#: ../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 "Zahajujem nahrávanie so žiadosťou na pôvodné ..." -#: ../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 "{0}% ({1}/{2}), {3} odchádza. Nahrávaný bod ''{4}'' (id: {5})" -#: ../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 "{0}% ({1}/{2}), {3} odchádza. Nahrávaná cesta ''{4}'' (id: {5})" -#: ../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 "{0}% ({1}/{2}), {3} odchádza. Nahrávaná relácia ''{4}'' (id: {5})" -#: ../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 "Začínam nahrávať požiadavku ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#, fuzzy, java-format +msgid "Value >0 expected for parameter ''{0}'', got {1}" +msgstr "neočakávaná hodnota parametra\"index\". Got {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 +#, fuzzy +msgid "Starting to upload in chunks..." +msgstr "Začínam nahrávať požiadavku ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151 +#, fuzzy, java-format +msgid "({0}/{1}) Uploading {2} objects..." +msgstr "Nahrávam {0} objekty(ov) ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 msgid "Uploading data ..." msgstr "Nahrávam dáta ..." - -#: ../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 "" -"VAROVANIE: žiadna API verzia vymedzená pre dáta na nahratie. Ustúpiť do " -"verzie 0.6" - -#: ../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 "" -"Varovanie: nastavenie ''{0}'' alebo api verzia ''{1}'' z dátovej sady " -"požadujú použiť rozdielne nahratie , ale API nie je schopného " -"ovládať.Ignorujem rozdielne nahrávanie." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10902,17 +11387,27 @@ msgstr "Sťahujem Pluginy {0}..." -#: ../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 "Zmazať {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Chyba pri mazaní súboru pluginu: {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166 msgid "Skip download" msgstr "Vynechať sťahovanie" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Download Plugin" msgstr "Stiahnuť Plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167 msgid "Skip Download" msgstr "Vynechať Sťahovanie" -#: ../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}." @@ -10924,17 +11419,15 @@ msgstr "Nastala chyba v plugine {0}" -#: ../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 "" -"Načítanie z {0} pluginov bolo požadované. Tento plugin nie je ďalej potrebný." - -#: ../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?" +"developed and very likely will produce errors.
It should be disabled." +"
Delete from preferences?" msgstr "" "Počet {0} pluginov bolo požadovaných.
Tento plugin nie je naďalej " @@ -10942,5 +11435,5 @@ "vyradený.
Zmazať z nastavení?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102 msgid "" "You updated your JOSM software.\n" @@ -10952,50 +11445,50 @@ "Aktualizovať pluginy teraz?" -#: ../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 "Pluginy boli naposledy aktualizované pred {0} dňami." -#: ../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 "Aktualizovať pluginy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 msgid "Skip update" msgstr "Vynechať aktualizáciu" -#: ../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 "Plugin {0} požaduje JOSM aktualizáciu na verziu {1}." -#: ../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 "Nebol nájdený plugin {0}, ktorý je vyžadovaný pluginom {1}." -#: ../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 "Plugin nenájdený: {0}." -#: ../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 "Nemôžem nahrať plugin {0}. Zmazať z konfigurácie?" -#: ../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 "Vypnúť doplnok" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Keep plugin" msgstr "Zachovať plugin" -#: ../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 " @@ -11005,9 +11498,9 @@ "ich prepísaniu." -#: ../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 "" @@ -11016,10 +11509,10 @@ "Vyskytla sa chyba pravdepodobne zapríčinená doplnkom (angl: plugin) ''{0}''." -#: ../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 "Podľa informácie v doplnku jeho autorom je ''{0}''." -#: ../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." @@ -11027,9 +11520,9 @@ "Vyskúšajte aktualizovať plugin na najnovšiu verziu pre nahláseným chyby." -#: ../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 "Vypnúť doplnok?" -#: ../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 " @@ -11039,13 +11532,13 @@ "prestal používať." -#: ../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 "Plugin nemôže byť odstránený. Pravdepodobne to bolo už vypnuté." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:386 msgid "Plugin information" msgstr "Informácia o pluginoch" -#: ../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" @@ -11154,4 +11647,7 @@ "sure you've updated to the latest version of JOSM here:

" msgstr "" +"

Stretli ste sa s nejakou chybou v JOSMe. Predtým ako pošlete správu " +"s chybou
uistite sa, že ste tu aktualizovali na poslednú verziu JOSMu:" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:96 @@ -11160,4 +11656,7 @@ "please
file a bug in our bugtracker using this link:

" msgstr "" +"Mali by ste tiež aktualizovať vaše pluginy. Ak nič z tohto nepomôže " +"prosím
pošlite súbor s chybou v našom bugtracker použitím tohto linku:" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:99 @@ -11165,7 +11664,10 @@ "

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.

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

" +msgstr "" +"

Táto chybová správa, poskytnutá dolu, by už mala byť
vyplnená " +"vami. Prosím vložte správu, kde sa opakuje
chyba a skúste napísať podľa " +"možností viac detailov.

" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:103 @@ -11174,4 +11676,6 @@ "information
below at this URL:

" msgstr "" +"

Ak to nefunguje, môžete ručne naplniť zprávu
dole v tejto URL:" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:111 @@ -11181,5 +11685,5 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:120 msgid "You've encountered a bug in JOSM" -msgstr "" +msgstr "Stretli ste sa s chybou v JOSMe" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 @@ -11189,7 +11693,7 @@ "the server URL in your preferences and your internet connection." msgstr "" -"Neúspešná inicializácia komunikácie s OSM serverom " -"{0}.
Skontrojujte URL servera vo vašich nastaveniach a vo vašom " -"internetovom pripojení." +"Neúspešná inicializácia komunikácie s OSM serverom {0}." +"
Skontrojujte URL servera vo vašich nastaveniach a vo vašom internetovom " +"pripojení." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 @@ -11208,10 +11712,10 @@ 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 "" "Aktualizácia na server neuspešná pretože vaša " -"aktuálna
dátová sada nespĺňa predpoklad.
Chybová správa " -"je:
{0}" +"aktuálna
dátová sada nespĺňa predpoklad.
Chybová správa je:
{0}" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 @@ -11273,7 +11777,6 @@ "check your internet connection." msgstr "" -"Neúspešné otváranie a pripájanie na vzdialený " -"server
''{0}''.
Prosím, skontrolujte vaše internetové " -"pripojenie." +"Neúspešné otváranie a pripájanie na vzdialený server
''{0}''." +"
Prosím, skontrolujte vaše internetové pripojenie." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 @@ -11289,7 +11792,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 "" "OSM server
''{0}''
hlási vnútornú chybu serveru.
Toto je " @@ -11303,7 +11805,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 "" "Plocha, ktorú sa snažíte nahrať je príliš veľká, alebo vaša požiadavka bola " @@ -11336,8 +11838,7 @@ "preferences and your internet connection." msgstr "" -"Neúspešné otváranie a pripájanie na vzdialený " -"server
''{0}''.
Meno hostiteľa ''{1}'' nemôže byť vyriešený. " -"
Prosím skontrolujte API URL vo vašich nastaveniach a vaše internetové " -"pripojenie." +"Neúspešné otváranie a pripájanie na vzdialený server
''{0}''." +"
Meno hostiteľa ''{1}'' nemôže byť vyriešený.
Prosím skontrolujte API " +"URL vo vašich nastaveniach a vaše internetové pripojenie." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 @@ -11346,24 +11847,24 @@ "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 "" "Server hlási, že objekt je zmazaný.
Nahrávanie je " "neúspešné Ak ste sa snažili nahrať, alebo vymazať tento objekt.
" -"Nahrávanie neúspešné ak ste sa snažili nahrať tento " -"objekt.

Chybová správa je:
{0}" +"Nahrávanie neúspešné ak ste sa snažili nahrať tento objekt." +"

Chybová správa je:
{0}" #: ../core/src/org/openstreetmap/josm/tools/I18n.java:98 msgid "Loading available locales..." -msgstr "" +msgstr "Nahrávam dostupné likality..." #: ../core/src/org/openstreetmap/josm/tools/I18n.java:102 msgid "Checking locales..." -msgstr "" +msgstr "Kontrolujem lokality..." #: ../core/src/org/openstreetmap/josm/tools/I18n.java:105 #, java-format msgid "Checking translation for locale ''{0}''" -msgstr "" +msgstr "Kontrolujem preklady pre lokality ''{0}''" #: ../core/src/org/openstreetmap/josm/tools/I18n.java:171 @@ -11629,5 +12130,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" @@ -11643,12 +12144,10 @@ msgstr "Definovať vloženie(interpolation) adresy" -#. 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 "Nepárny (odd)" -#: ../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 @@ -11656,458 +12155,145 @@ msgstr "Vyrovnať (even)" -#: ../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 "Abecedne" -#: ../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 "Číslo" + +#. 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 "prírodné (natural)" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "miesto (blízke okolie)" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Požičovňa" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190 #, java-format msgid "Relation: {0}" msgstr "Relácia: {0}" -#: ../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 "Pridružiť s využitím ulice:" -#: ../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 "Číslovací systém:" -#: ../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 "vnútorná časť (inner segment)" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220 msgid "Starting #:" msgstr "Spustenie #:" -#: ../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 "Ukončenie #:" -#: ../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 "Pridružiť {0} dodatočné body s číslami domov" -#: ../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 "Mesto:" -#: ../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 "Štát:" -#: ../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 "PSČ:" -#: ../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 "Krajina:" -#: ../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 "Úplná Adresa:" -#: ../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 "Voliteľné informácie:" -#: ../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 "Prosím zvoľte ulicu pre pridruženie s adresami vloženou cestou" -#: ../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 "Prosím vyberte adresami vloženú cestu pre túto ulicu" -#: ../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 "Očakávané nepárne čísla pre adresy" -#: ../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 "Očakávané párne čísla pre adresy" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093 +#, fuzzy +msgid "Expected valid number for address increment" +msgstr "Očakávané nepárne čísla pre adresy" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 msgid "Country code must be 2 letters" msgstr "Kód krajiny musí byť z 2 písmen" -#: ../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 "" -"Prosím vložte platné číslo pre spustenie a ukončenie doplnenia adries" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909 +msgstr "Prosím vložte platné číslo pre spustenie a ukončenie doplnenia adries" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1296 msgid "Alphabetic address must end with a letter" msgstr "Abecedné adresy musia končiť s písmenom" -#: ../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 "Počiatočné a koncové čísla musia byť rovnaké pre abecedné adresy" -#: ../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 "Spúšťajúce písmeno adresy musí byť nižšie ako konečné písmeno adresy" -#: ../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 "Prosím vložte platné číslo pre spustenie adresovania" -#: ../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 "Prosím vložte platné číslo pre ukončenie adresovania" -#: ../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 "Spúšťajúce adresné číslo musí byť nižšie ukončovacie adresné číslo" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "AgPifoJ - Geotagged pictures" -msgstr "AgPifoJ - obrázky s geoznačkami" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "Zobraziť fotky s geoznačkami" - -#: ../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 "Predchádzajúci" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Odstraniť fotku z vrstvy" - -#: ../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 "Nasledujúci" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "Stredový pohľad" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102 -msgid "Zoom best fit and 1:1" -msgstr "Najvhodnejšie zväčšenie 1:1" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 -#, java-format -msgid "" -"\n" -"Altitude: {0} m" -msgstr "" -"\n" -"Výška: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/h" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "Získavam GPS polohu z EXIF" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121 -msgid "Starting directory scan" -msgstr "Začínam prehľadávať adresár" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:126 -msgid "One of the selected files was null" -msgstr "Niektorý z vybratých súborov bol prázdny" - -#: ../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 "Čítať fotky..." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:186 -#, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "Nemôžem získať cestu pre adresár {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "Prehľadávam adresár {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "Nájdený prázdny súbor v adresári {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Chyba pri získavaní súború z adresára {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "Zladiť GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} boli nájdené s gps značkami." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "Otvoriť obrázky s AgPifoJ..." - -#: ../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 "Načítať sadu obrázkov na novú vrstvu." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "Súbory GPX (*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "Súbor {0} je ešte nahratý pod menom \"{1}\"" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#, java-format -msgid "Error while parsing {0}" -msgstr "Chyba pri rozkladaní {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Nemôžem čítať \"{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 "" -"Urobte fotku Vášho GPS zariadenia keď ukazuje čas.
Zobrazte " -"fotku.
Potom len zapíšte čas ktorý vidíte na fotke a vyberte časovú zónu. " -"
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Čas fotografie (z exif):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "GPS čas (čítaj nad fotografiou) " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [dd/mm/yyyy hh:mm:ss]" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 -msgid "I'm in the timezone of: " -msgstr "Som v časovej zóne: " - -#: ../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 "Žiaden dátum" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "Otvoriť inú fotografiu" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 -msgid "Synchronize time from a photo of the GPS receiver" -msgstr "Synchronizovať čas z fotky a GPS prímača" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"Chyba pri rozkladaní (parsovaní) dát.\n" -"Prosím použite požadovaný formát." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "Neplatný dátum" - -#: ../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 "GPX stopa(trasa): " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Otvoriť inú GPX stopu(trasu)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -msgid "Timezone: " -msgstr "Časové pásmo: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 -msgid "Offset:" -msgstr "Vyrovnať(Offset):" - -#: ../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 "" -"Môžem použiť obrázok z môjho GPS prímača.
Môže toto pomôcť?" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Aktualizovať pozíciu pre: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Všetky obrázky" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Obrázky bez exif pozície" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Zatiaľ neoznačkované obrázky" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 -msgid "Correlate images with GPX track" -msgstr "Zladiť obrázky s GPX stopou(track)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Correlate" -msgstr "Zladiť" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Auto-Guess" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "Môžete vybrať GPX stopu(track)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Nevybratá GPX stopa(track)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Chyba pri rozkladaní časového pásma.\n" -"Čakám na formát: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Neplatné časové pásmo" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Chyba pri rozkladaní vyrovnania(offset).\n" -"Čakám na formát: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Neplatné vyrovnanie (offset)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Najdené {0} zhody z {1} v GPX stope {2}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "Nahratá GPX stopa(trasa)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "Vybraté fotografie neobsahujú informácie o čase." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Fotografie neobsahujú informácie o čase." - -#: ../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 "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX Stopa nemá informáciu o čase." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Časové pásmo: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minút: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Sekúnd: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Zladené {0} z {1} fotiek k GPX stope." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Časový rozdiel z {0} dní)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Vyrovnanie rozdielu medzi stopou(track) a fotkami: {0}m {1}s" - -#: ../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 "" -"Chyba nastala zatiaľ čo sa snažím dať fotky do GPX trasy. Musíte nastaviť " -"posúvač ručne na fotky." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 -msgid "Matching photos to track failed" -msgstr "Priraďovanie fotiek ku stope(track) zlyhalo" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Nastaviť časové pásmo a vyváženie(offset)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Východzie hodnoty" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433 -msgid "No image" -msgstr "Bez obrázka" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "Nahrávam {0}" - -#: ../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 "Chyba v súbore {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -12264,17 +12450,14 @@ #: ../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." -msgstr "" -"Špeciálny manipulant pre francúzsky kataster wms at " -"www.cadastre.gouv.fr

Prosím čítajte Podmienky pre využívanie " -"(francúzsky):
" +"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 "" +"Špeciálny manipulant pre francúzsky kataster wms at www.cadastre.gouv." +"fr

Prosím čítajte Podmienky pre využívanie (francúzsky):
" "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html " "
predtým, ako nahráte nejaké dáta vytvorené týmto pluginom." @@ -12286,6 +12469,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "Value of key \"source\" when autosourcing is enabled" -msgstr "" -"Hodnota kľúča \"zdroj\" keď je automatický zdroj zapnutý" +msgstr "Hodnota kľúča \"zdroj\" keď je automatický zdroj zapnutý" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 @@ -12504,6 +12686,6 @@ msgid "Click second Lambert crosspiece for georeferencing" msgstr "" -"Zvoľte druhý Lambert priečnik(crosspiece) pre určovanie zemepisnej " -"polohy(georeferencing)" +"Zvoľte druhý Lambert priečnik(crosspiece) pre určovanie zemepisnej polohy" +"(georeferencing)" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246 @@ -12609,13 +12791,4 @@ msgid "Export as PNG format (only raster images)" msgstr "Exportovať ako PNG formát (iba rastrové obrázky)" - -#: ../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] "Zjednodušenie cesty (odstránenie {0} bodu)" -msgstr[1] "Zjednodušenie cesty (odstránenie {0} bodov)" -msgstr[2] "Zjednodušenie cesty (odstránenie {0} bodov)" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 @@ -12736,14 +12909,14 @@ msgstr "Farebná schéma" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37 -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 +#: ../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 "Rozdeliť oblasť" -#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 msgid "Splits an area by an untagged way." msgstr "Rozdeliť oblasť podľa neoznačenej cesty" -#: ../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 " @@ -13056,4 +13229,8 @@ msgstr "Otvoriť obrázky s ImageWayPoint" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Načítať sadu obrázkov na novú vrstvu." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -13097,18 +13274,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 "Zapnutá vertex redukcia..." -#: ../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 "Zapnutá Douglas-Peucker approximácia..." -#: ../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 "Odstraňujem duplicitné body..." -#: ../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" @@ -13157,7 +13334,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -13167,5 +13344,5 @@ #. 50000 #. -#. +#. #. #. @@ -13175,5 +13352,5 @@ #. 50000 #. -#. +#. #. #. @@ -13182,5 +13359,5 @@ #. 50000 #. -#. +#. #. #. @@ -13190,5 +13367,5 @@ #. 50000 #. -#. +#. #. #. @@ -13266,6 +13443,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 "" "Maximálny počet úsekov v každej vygenerovanej ceste. Východzia hodnota 250." @@ -13289,11 +13465,10 @@ #: ../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 " +"Accuracy of Douglas-Peucker line simplification, measured in degrees." +"
Lower values give more nodes, and more accurate lines. Default 0.0003." +msgstr "" +"Presnosť Douglas-Peucker zjednodušenia línií, je meraná v stupňoch." +"
Nižšia hodnota dáva viac bodov, a väčšiu presnosť línií. Štandardne " "0.0003." -msgstr "" -"Presnosť Douglas-Peucker zjednodušenia línií, je meraná v " -"stupňoch.
Nižšia hodnota dáva viac bodov, a väčšiu presnosť línií. " -"Štandardne 0.0003." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 @@ -13358,20 +13533,19 @@ msgstr "Nemôžem získať obrázok" -#: ../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 "Pripájam sa" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Pripojené" -#. 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 "Nepripojený" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "Spojenie zlyhalo" @@ -13594,6 +13768,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 "" "Hlavička obsahuje niekoľko hodnôt a nemôže byť namapovaný jednotlivý reťazec" @@ -13679,9 +13852,10 @@ msgstr "Neznámy typ súboru: {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 "Osmarender" -#: ../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 " @@ -13690,9 +13864,5 @@ "Firefox sa nenašiel. Prosím nastavte spúšťací .exe súbor v nastaveniach." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "možnosti pre osmarender" - -#: ../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 "Spúšťací súbor Firefoxu" @@ -14073,17 +14243,17 @@ msgstr "Najskôr určite zdroj predvoľby značenia v predvoľbách." -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" msgstr "Otočiť smer radu budov" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37 msgid "Reverses house numbers on a terrace." msgstr "Otočenie uličných čísel radu budov" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 msgid "Reverse a Terrace" msgstr "Otočiť smer radu budov" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110 msgid "Reverse Terrace" msgstr "Otočiť smer radu budov" @@ -14127,167 +14297,4 @@ msgid "Optional" msgstr "Voliteľné" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "Spojiť prekrývajúce sa Plochy" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Joins areas that overlap each other" -msgstr "Spojiť plochy ktoré sa prekrývajú" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 -msgid "Only up to two areas can be joined at the moment." -msgstr "Teraz môžu byť spojené iba dve plochy(areas)." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 -#, java-format -msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "\"{0}\" niesú uzavreté a preto nemôžu byť spojené.." - -#: ../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 "" -"Vybratá cesta(y) ma body mimo sťahovanej oblasti dát.\n" -"Toto môže viesť k tomu, že body môžu byť náhodou vymazané.\n" -"Ste si naozaj istý, že chcete pokračovať?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 -msgid "Please abort if you are not sure" -msgstr "Prosím prerušiť ak ste si nie istý" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 -msgid "Please select at least one closed way the should be joined." -msgstr "Prosím vyberte aspoň jednu uzavretú cestu ktorá by mala byť spojená." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175 -msgid "No intersection found. Nothing was changed." -msgstr "Nenájdený žiadny priesečník. Nič nebolo zmenené." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197 -msgid "Added node on all intersections" -msgstr "Pridať body na všetky priesečníky" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221 -msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "Vymazať cesty, ktoré nie sú vnútornou časťou multipolygónu" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226 -msgid "Fix relations" -msgstr "Oprava relácie" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 -msgid "Joined self-overlapping area" -msgstr "Spojená prekrývajúca sa plocha" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 -msgid "Joined overlapping areas" -msgstr "Spojené prekrývajúce sa plochy" - -#: ../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 "" -"Niektoré z ciest mali časť vzťahov (relations), ktoré boli zmenené. Prosím " -"overte či to nepredstavuje nejakú chybu." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 -msgid "Enter values for all conflicts." -msgstr "Zadajte hodnoty pre všetky konflikty" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Riešenie konfliktov" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312 -msgid "Fix tag conflicts" -msgstr "Oprava konfliktu (rozporu) značiek" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462 -msgid "Removed Element from Relations" -msgstr "Odstránený Prvok z Relácií" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571 -msgid "Join Areas: Remove Short Ways" -msgstr "Spojiť plochy: Vymazať krátke cesty" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587 -msgid "Closed Way" -msgstr "Uzavretá cesta" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854 -msgid "Remove tags from inner ways" -msgstr "Vymazať značky z vnútorných ciest" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883 -msgid "Join Areas Function" -msgstr "Funkcie Spojenia Plôch (Join Areas Function)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Jump To Position" -msgstr "Skok na miesto (pozíciu)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Opens a dialog that allows to jump to a specific location" -msgstr "Otvoriť dialógové okno, aby bol umožnený skok na konkrétne miesto" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 -msgid "Enter Lat/Lon to jump to position." -msgstr "Vložiť Šírku/Dĺžku pre skok na miesto." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 -msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "Môžete tiež vložiť nejakú URL z www.openstreetmap.org" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 -msgid "Zoom (in metres)" -msgstr "Zväčšenie (v metroch)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -msgid "Jump there" -msgstr "Skok tam" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 -msgid "Jump to Position" -msgstr "Skok na miesto (pozíciu)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Could not parse Latitude, Longitude or Zoom. Please check." -msgstr "" -"Nemôžem zistiť Šírku, Dĺžku, alebo Zväčšenie(zoom). Prosím skontrolujte to." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Unable to parse Lon/Lat" -msgstr "Niesom schopný vyčítať Šírku/Dĺžku" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Simplify Way" -msgstr "Zjednodušiť cestu" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Zmazať nepotrebné body z cesty." - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "Vyberte aspoň jednu cestu k zjednodušeniu." - -#: ../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] "Výber obsahuje {0} cestu. Naozaj ju chcete zjednodušiť?" -msgstr[1] "Výber obsahuje {0} cesty. Naozaj ich chcete zjednodušiť?" -msgstr[2] "Výber obsahuje {0} ciest. Naozaj ich chcete zjednodušiť?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "Ste si istý?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -14389,5 +14396,5 @@ msgstr "ostatné overovania" -#: ../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}" @@ -14440,34 +14447,34 @@ msgstr "Nabudúce ignorovať označené chyby." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Celá skupina" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Jednotlivé prvky" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Nič" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Ignorovať celú skupinu, alebo jednotlivé prvky?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 msgid "Ignoring elements" msgstr "Ignorujem prvky(elements)" -#: ../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 "Opravujem chyby..." -#: ../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 "Opravuje sa ({0}/{1}): ''{2}''" -#: ../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 "Aktualizujem mapu ..." @@ -14518,18 +14525,18 @@ msgstr "Zkrížené cesty" -#: ../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 "Duplicitné body" -#: ../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 "Tento test zisťuje či nie je viac bodov na jednom mieste." -#: ../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 "Body s rovnakou pozíciou" -#: ../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 "Potvrdenie" @@ -14642,6 +14649,5 @@ msgid "" "This test checks for ways that contain some of their nodes more than once." -msgstr "" -"Tento test kontroluje cesty, či neobsahujú niektorý bod viac ako raz." +msgstr "Tento test kontroluje cesty, či neobsahujú niektorý bod viac ako raz." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38 @@ -14653,6 +14659,5 @@ msgid "" "This test checks for ways with similar names that may have been misspelled." -msgstr "" -"Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep." +msgstr "Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 @@ -14768,11 +14773,10 @@ #: ../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." -msgstr "" -"Zdroje (URL alebo názov súboru) z predstavených kontrol (pozrite " -"http://wiki.openstreetmap.org/index.php/User:JLS/speller) alebo súbory na " -"kontrolu značiek." +"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." +"org/index.php/User:JLS/speller) or tag checking data files." +msgstr "" +"Zdroje (URL alebo názov súboru) z predstavených kontrol (pozrite http://wiki." +"openstreetmap.org/index.php/User:JLS/speller) alebo súbory na kontrolu " +"značiek." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 @@ -14916,5 +14920,5 @@ #. 50000 #. -#. +#. #. #. @@ -14922,5 +14926,5 @@ #. #. -#. +#. #. #. @@ -14930,5 +14934,5 @@ #. 50000 #. -#. +#. #. #. @@ -14937,5 +14941,5 @@ #. 50000 #. -#. +#. #. #. @@ -14944,5 +14948,5 @@ #. 50000 #. -#. +#. #. #. @@ -14951,5 +14955,5 @@ #. 50000 #. -#. +#. #. #. @@ -14958,5 +14962,5 @@ #. 50000 #. -#. +#. #. #. @@ -14965,9 +14969,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -15012,5 +15016,5 @@ #. 50000 #. -#. +#. #. #. @@ -15064,6 +15068,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60 msgid "This test checks for untagged, empty and one node ways." -msgstr "" -"Tento test hledá neotagované(neoznačené), prázdne a jednobodové cesty." +msgstr "Tento test hledá neotagované(neoznačené), prázdne a jednobodové cesty." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91 @@ -15147,14 +15150,14 @@ msgstr "Walking Papers" -#: ../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 "Way Download (Sťahovanie cesty)" -#: ../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 "Sťahovanie údajov mapy na konci vybratej cesty" -#: ../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 " @@ -15166,16 +15169,16 @@ "najskôr celú cestu." -#: ../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 "Nemôžem nájsť jedinečný bod pre začiatok sťahovania." -#: ../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 "" -"Nenachádza sa tam žiadna cesta spojená s bodom ''{0}''. " -"Prerušujem." - -#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 +"Nenachádza sa tam žiadna cesta spojená s bodom ''{0}''. Prerušujem." + +#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:167 #, java-format msgid "" @@ -15184,5 +15187,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 "" @@ -15194,13 +15197,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 "Zlúčiť duplikátne body?" -#: ../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 "Nie je viac spojených ciest pre stiahnutie." -#: ../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." @@ -15299,6 +15302,5 @@ "Warning: Fetching WMS tiles is likely to fail. Please check you preference " "settings." -msgstr "" -"Varovanie: Výber WMS dlaždíc zlyháva. Prosím skontrolujte nastavenie." +msgstr "Varovanie: Výber WMS dlaždíc zlyháva. Prosím skontrolujte nastavenie." #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 @@ -15351,6 +15353,6 @@ "Základ URL
''{0}''
pre túto WMS vrstvu neobsahuje na konci " "žiadnu z ''&'' ani s ''?''.
Toto pravdepodobne vedie k chybnej WMS " -"požiadavke. Mali by ste skontrolovať vaše
nastavenie " -"preferencií.
Chcete doniesť WMS dlaždice aj napriek tomu?" +"požiadavke. Mali by ste skontrolovať vaše
nastavenie preferencií." +"
Chcete doniesť WMS dlaždice aj napriek tomu?" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 @@ -15368,50 +15370,50 @@ "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "Stiahnuť viditeľné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "Zmena rozlíšenia" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Reload erroneous tiles" msgstr "Nahrať poškodené dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:369 msgid "Save WMS layer to file" msgstr "Uložiť WMS vrstvu do súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "Uložiť WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "Nahrať WMS vrstvu zo súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "Načítať WMS vrstvu" -#: ../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 "Nepodporovaná verzia WMS súboru; nájdené {0}, očakávané {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "File Format Error" msgstr "Chyba formátu súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "Chyba pri nahrávaní súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -15487,5 +15489,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 "" @@ -15528,23 +15530,16 @@ #. Plugin AddrInterpolation #: build/trans_plugins.java:3 -msgid "Group common Address Interpolation inputs in a single dialog," -msgstr "Zoskupiť bežné Address Interpolation vstupy do jedného dialógu." - -#. 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 "" -"Ďalší geotag(GPS poloha) plugin pre JOSM. Zľaďované obrázky s GPS stopami, " -"alebo import EXIF geotagged(GPS poloha) obrázkov." - -#. Plugin cadastre-fr -#: build/trans_plugins.java:7 msgid "A special handler for the French land registry WMS server." msgstr "Špeciálny manipulant pre francúzsky WMS server pozemkového registra." #. Plugin colorscheme -#: build/trans_plugins.java:9 +#: build/trans_plugins.java:7 msgid "" "Allows the user to create different color schemes and to switch between " @@ -15557,26 +15552,25 @@ "medzi nimi. Iba zmena farieb a vytvoriť novú schému. Použiť prepínač na " "biele pozadie so zodpovedajúcimi farbami pre lepšiu viditeľnosť pri jasnom " -"slnečnom svetle. Pozrieť dialóg v JOSM nastaveniach a 'Map " -"Settings(nastavenia mapy' (divné, ale pravdivé :-)" +"slnečnom svetle. Pozrieť dialóg v JOSM nastaveniach a 'Map Settings" +"(nastavenia mapy' (divné, ale pravdivé :-)" #. Plugin Create_grid_of_ways -#: build/trans_plugins.java:11 +#: build/trans_plugins.java:9 msgid "Create a grid of ways." msgstr "Vytvára cestnú sieť" #. Plugin czechaddress +#: build/trans_plugins.java:11 +msgid "" +"Creating and handling address nodes and buildings within Czech Republic." +msgstr "Vytvorenie a správa adresných bodov a budov vrámci Českej Republiky." + +#. Plugin dataimport #: build/trans_plugins.java:13 -msgid "" -"Creating and handling address nodes and buildings within Czech Republic." -msgstr "" -"Vytvorenie a správa adresných bodov a budov vrámci Českej Republiky." - -#. Plugin dataimport -#: build/trans_plugins.java:15 msgid "Allows to import various file formats into JOSM directly." msgstr "Dovoľuje import rôzdnych formátov súborov priamo do JOSMu." #. Plugin DirectUpload -#: build/trans_plugins.java:17 +#: build/trans_plugins.java:15 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " @@ -15587,10 +15581,10 @@ #. Plugin Duplicate-Way -#: build/trans_plugins.java:19 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "Duplikovať cesty s rozostupom/vzdialenosťou" #. Plugin editgpx -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -15601,21 +15595,20 @@ #. Plugin globalsat +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." +msgstr "Sťahuje GPS body z Globalsat DG100 datalogger-a priamo do JOSM." + +#. Plugin graphview #: build/trans_plugins.java:23 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." -msgstr "Sťahuje GPS body z Globalsat DG100 datalogger-a priamo do JOSM." - -#. Plugin graphview -#: build/trans_plugins.java:25 msgid "Visualizes routing information as a routing graph." msgstr "Vizualizuje \"routing information\" ako routovací graf." #. Plugin grid -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Určiť vrstvu pozadia pre zobrazenie mapovej súradnicovej siete" #. Plugin ImageWayPoint -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -15628,10 +15621,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Pomoc pri vektorizácii WMS obrázkov." #. Plugin livegps -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -15641,5 +15634,5 @@ #. Plugin measurement -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -15652,10 +15645,10 @@ #. Plugin michigan_left -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:35 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "Pridanie zákazu zabočenia vľavo pre sadu zo 4 alebo 5 ciest" #. Plugin multipoly -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:37 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -15666,5 +15659,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 " @@ -15677,15 +15670,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:41 msgid "Displays an OpenLayers background image" msgstr "Zobrazenie OpenLayers obrázok pozadia" #. Plugin openstreetbugs -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:43 msgid "Imports issues from OpenStreetBugs" msgstr "Importuje vydania z OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:45 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -15695,12 +15688,12 @@ #. Plugin osmarender +#: build/trans_plugins.java:47 +msgid "" +"Launches FireFox to display the current visible screen as a nice SVG image." +msgstr "" +"Spúšťa FireFox na aktuálne viditeľné zobrazenie, ako pekný SVG obrázok." + +#. Plugin PicLayer #: build/trans_plugins.java:49 -msgid "" -"Launches FireFox to display the current visible screen as a nice SVG image." -msgstr "" -"Spúšťa FireFox na aktuálne viditeľné zobrazenie, ako pekný SVG obrázok." - -#. Plugin PicLayer -#: build/trans_plugins.java:51 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -15711,15 +15704,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:51 msgid "The great JGoodies Plastic Look and Feel." msgstr "Ohromný JGoodies Plastic Look and Feel." #. Plugin remotecontrol -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:53 msgid "Let other applications send commands to JOSM." msgstr "Necháva ostatné aplikácie poslať príkaz do JOSMu." #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15730,10 +15723,10 @@ #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:57 msgid "Provides routing capabilities." msgstr "Určuje trasové schopnosti" #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:59 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -15744,15 +15737,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:61 msgid "Allow adding markers/nodes on current gps positions." msgstr "Povoľuje pridávanie značiek/bodov na aktuálnu gps pozíciu." #. Plugin tageditor -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:63 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Určuje dialóg pre editáciu značiek v tabuľkovej mriežke." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:65 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -15765,19 +15758,10 @@ #. Plugin terracer -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:67 msgid "Make terraced houses out of single blocks." msgstr "Vytvára radové domy mimo jednotlivých blokov." -#. 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 "" -"Niekoľko pomôcok(utilities) ktoré vám uľahčia život(prácu): napr. " -"zjednodušenie cesty, spojiť plochy, skok na pozíciu." - #. Plugin validator -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -15789,5 +15773,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15798,5 +15782,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -15804,5 +15788,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -16857,8 +16841,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -17055,5 +17039,5 @@ #. color motorroad #. -#. +#. #. #. @@ -17063,5 +17047,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17080,5 +17064,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17088,5 +17072,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17105,5 +17089,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17113,5 +17097,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17130,5 +17114,5 @@ #. 200000000 #. -#. +#. #. #. @@ -17138,5 +17122,5 @@ #. 300000 #. -#. +#. #. #. @@ -17151,5 +17135,5 @@ #. 300000 #. -#. +#. #. #. @@ -17167,5 +17151,5 @@ #. 50000 #. -#. +#. #. #. @@ -17183,5 +17167,5 @@ #. 40000 #. -#. +#. #. #. @@ -17190,5 +17174,5 @@ #. 40000 #. -#. +#. #. #. @@ -17198,5 +17182,5 @@ #. 50000 #. -#. +#. #. #. @@ -17216,5 +17200,5 @@ #. 50000 #. -#. +#. #. #. @@ -17223,5 +17207,5 @@ #. 50000 #. -#. +#. #. #. @@ -17231,5 +17215,5 @@ #. 50000 #. -#. +#. #. #. @@ -17279,7 +17263,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17946,6 +17930,5 @@ #: build/trans_presets.java:892 msgid "Bus Trap" -msgstr "" -"Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)" +msgstr "Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)" #. item "Barriers/Bus Trap" @@ -17984,5 +17967,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -18021,5 +18004,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -18107,6 +18090,5 @@ #: build/trans_presets.java:1043 msgid "Sally Port" -msgstr "" -"Sally port (vstupný portál do pevnosti s vonkajšou a vnútornou bránou)" +msgstr "Sally port (vstupný portál do pevnosti s vonkajšou a vnútornou bránou)" #. item "Barriers/Sally Port" @@ -18118,5 +18100,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -18273,5 +18255,5 @@ #. 50000 #. -#. +#. #. #. @@ -19659,5 +19641,5 @@ #. 30000 #. -#. +#. #. #. @@ -19667,5 +19649,5 @@ #. 40000 #. -#. +#. #. #. @@ -19675,5 +19657,5 @@ #. 20000 #. -#. +#. #. #. @@ -19683,5 +19665,5 @@ #. 40000 #. -#. +#. #. #. @@ -20039,7 +20021,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -20049,5 +20031,5 @@ #. 50000 #. -#. +#. #. #. @@ -20057,5 +20039,5 @@ #. 50000 #. -#. +#. #. #. @@ -20065,5 +20047,5 @@ #. 50000 #. -#. +#. #. #. @@ -20073,5 +20055,5 @@ #. 50000 #. -#. +#. #. #. @@ -20081,5 +20063,5 @@ #. 50000 #. -#. +#. #. #. @@ -20089,5 +20071,5 @@ #. 50000 #. -#. +#. #. #. @@ -20097,5 +20079,5 @@ #. 50000 #. -#. +#. #. #. @@ -20105,5 +20087,5 @@ #. 50000 #. -#. +#. #. #. @@ -20113,5 +20095,5 @@ #. 50000 #. -#. +#. #. #. @@ -20121,5 +20103,5 @@ #. 50000 #. -#. +#. #. #. @@ -20129,5 +20111,5 @@ #. 50000 #. -#. +#. #. #. @@ -20137,5 +20119,5 @@ #. 50000 #. -#. +#. #. #. @@ -20145,5 +20127,5 @@ #. 50000 #. -#. +#. #. #. @@ -20153,5 +20135,5 @@ #. 50000 #. -#. +#. #. #. @@ -20161,5 +20143,5 @@ #. 50000 #. -#. +#. #. #. @@ -20169,5 +20151,5 @@ #. 50000 #. -#. +#. #. #. @@ -20177,5 +20159,5 @@ #. 50000 #. -#. +#. #. #. @@ -20185,5 +20167,5 @@ #. 50000 #. -#. +#. #. #. @@ -20193,5 +20175,5 @@ #. 50000 #. -#. +#. #. #. @@ -20201,5 +20183,5 @@ #. 50000 #. -#. +#. #. #. @@ -20209,5 +20191,5 @@ #. 50000 #. -#. +#. #. #. @@ -20217,5 +20199,5 @@ #. 50000 #. -#. +#. #. #. @@ -20225,5 +20207,5 @@ #. 50000 #. -#. +#. #. #. @@ -20233,5 +20215,5 @@ #. 50000 #. -#. +#. #. #. @@ -20241,5 +20223,5 @@ #. 50000 #. -#. +#. #. #. @@ -20249,5 +20231,5 @@ #. 50000 #. -#. +#. #. #. @@ -20257,5 +20239,5 @@ #. 50000 #. -#. +#. #. #. @@ -20265,5 +20247,5 @@ #. 50000 #. -#. +#. #. #. @@ -20273,5 +20255,5 @@ #. 50000 #. -#. +#. #. #. @@ -20281,5 +20263,5 @@ #. 50000 #. -#. +#. #. #. @@ -20289,5 +20271,5 @@ #. 50000 #. -#. +#. #. #. @@ -20297,5 +20279,5 @@ #. 50000 #. -#. +#. #. #. @@ -20305,5 +20287,5 @@ #. 50000 #. -#. +#. #. #. @@ -20313,5 +20295,5 @@ #. 50000 #. -#. +#. #. #. @@ -20321,5 +20303,5 @@ #. 50000 #. -#. +#. #. #. @@ -20329,5 +20311,5 @@ #. 50000 #. -#. +#. #. #. @@ -20337,5 +20319,5 @@ #. 50000 #. -#. +#. #. #. @@ -20345,5 +20327,5 @@ #. 50000 #. -#. +#. #. #. @@ -20353,5 +20335,5 @@ #. 50000 #. -#. +#. #. #. @@ -20361,5 +20343,5 @@ #. 50000 #. -#. +#. #. #. @@ -20369,5 +20351,5 @@ #. 50000 #. -#. +#. #. #. @@ -20377,5 +20359,5 @@ #. 50000 #. -#. +#. #. #. @@ -20385,5 +20367,5 @@ #. 50000 #. -#. +#. #. #. @@ -20393,5 +20375,5 @@ #. 50000 #. -#. +#. #. #. @@ -20401,5 +20383,5 @@ #. 50000 #. -#. +#. #. #. @@ -20409,5 +20391,5 @@ #. 50000 #. -#. +#. #. #. @@ -22105,7 +22087,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22115,5 +22097,5 @@ #. 50000 #. -#. +#. #. #. @@ -22123,5 +22105,5 @@ #. 50000 #. -#. +#. #. #. @@ -22131,5 +22113,5 @@ #. 50000 #. -#. +#. #. #. @@ -22139,5 +22121,5 @@ #. 50000 #. -#. +#. #. #. @@ -22147,5 +22129,5 @@ #. 50000 #. -#. +#. #. #. @@ -22155,5 +22137,5 @@ #. 50000 #. -#. +#. #. #. @@ -22163,5 +22145,5 @@ #. 50000 #. -#. +#. #. #. @@ -23493,5 +23475,5 @@ #. 40000 #. -#. +#. #. #. @@ -23507,5 +23489,5 @@ #. 30000 #. -#. +#. #. #. @@ -23516,7 +23498,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23526,5 +23508,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -23534,13 +23524,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -23550,5 +23532,5 @@ #. 50000 #. -#. +#. #. #. @@ -23581,5 +23563,5 @@ #. 50000 #. -#. +#. #. #. @@ -23595,5 +23577,5 @@ #. 50000 #. -#. +#. #. #. @@ -23603,5 +23585,5 @@ #. 10000 #. -#. +#. #. #. @@ -23611,5 +23593,5 @@ #. 10000 #. -#. +#. #. #. @@ -23620,5 +23602,5 @@ #. 10000 #. -#. +#. #. #. @@ -23647,5 +23629,5 @@ #. 50000 #. -#. +#. #. #. @@ -23760,9 +23742,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 @@ -23770,5 +23752,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, @@ -23778,8 +23760,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 @@ -23793,5 +23775,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23799,5 +23781,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23846,6 +23828,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23925,5 +23907,5 @@ #. 40000 #. -#. +#. #. #. @@ -23933,5 +23915,5 @@ #. 10000 #. -#. +#. #. #. @@ -23940,5 +23922,5 @@ #. 50000 #. -#. +#. #. #. @@ -23948,5 +23930,5 @@ #. 50000 #. -#. +#. #. #. @@ -23955,5 +23937,5 @@ #. 50000 #. -#. +#. #. #. @@ -23962,5 +23944,5 @@ #. 50000 #. -#. +#. #. #. @@ -23969,5 +23951,5 @@ #. 50000 #. -#. +#. #. #. @@ -23976,5 +23958,5 @@ #. 50000 #. -#. +#. #. #. @@ -23983,5 +23965,5 @@ #. 40000 #. -#. +#. #. #. @@ -23990,5 +23972,5 @@ #. 50000 #. -#. +#. #. #. @@ -23997,5 +23979,5 @@ #. 50000 #. -#. +#. #. #. @@ -24004,5 +23986,5 @@ #. 50000 #. -#. +#. #. #. @@ -24011,5 +23993,5 @@ #. 50000 #. -#. +#. #. #. @@ -24018,5 +24000,5 @@ #. 50000 #. -#. +#. #. #. @@ -24025,5 +24007,5 @@ #. 50000 #. -#. +#. #. #. @@ -24033,5 +24015,5 @@ #. 50000 #. -#. +#. #. #. @@ -24040,5 +24022,5 @@ #. 50000 #. -#. +#. #. #. @@ -24049,5 +24031,5 @@ #. 50000 #. -#. +#. #. #. @@ -24059,11 +24041,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -24072,7 +24054,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24083,5 +24065,5 @@ #. 50000 #. -#. +#. #. #. @@ -24092,5 +24074,5 @@ #. 50000 #. -#. +#. #. #. @@ -24101,5 +24083,5 @@ #. 50000 #. -#. +#. #. #. @@ -24110,5 +24092,5 @@ #. 50000 #. -#. +#. #. #. @@ -24119,5 +24101,5 @@ #. 50000 #. -#. +#. #. #. @@ -24128,5 +24110,5 @@ #. 40000 #. -#. +#. #. #. @@ -24138,5 +24120,5 @@ #. 50000 #. -#. +#. #. #. @@ -24147,5 +24129,5 @@ #. 50000 #. -#. +#. #. #. @@ -24170,5 +24152,5 @@ #. 10000 #. -#. +#. #. #. @@ -24177,5 +24159,5 @@ #. 50000 #. -#. +#. #. #. @@ -24184,5 +24166,5 @@ #. 50000 #. -#. +#. #. #. @@ -24198,5 +24180,5 @@ #. 20000 #. -#. +#. #. #. @@ -24210,5 +24192,5 @@ #. 30000 #. -#. +#. #. #. @@ -24217,5 +24199,5 @@ #. 50000 #. -#. +#. #. #. @@ -24224,5 +24206,5 @@ #. 50000 #. -#. +#. #. #. @@ -24231,5 +24213,5 @@ #. 50000 #. -#. +#. #. #. @@ -24238,5 +24220,5 @@ #. 50000 #. -#. +#. #. #. @@ -24245,5 +24227,5 @@ #. 50000 #. -#. +#. #. #. @@ -24252,5 +24234,5 @@ #. 50000 #. -#. +#. #. #. @@ -24259,5 +24241,5 @@ #. 50000 #. -#. +#. #. #. @@ -24266,5 +24248,5 @@ #. 50000 #. -#. +#. #. #. @@ -24273,5 +24255,5 @@ #. 50000 #. -#. +#. #. #. @@ -24280,5 +24262,5 @@ #. 50000 #. -#. +#. #. #. @@ -24287,5 +24269,5 @@ #. 50000 #. -#. +#. #. #. @@ -24294,5 +24276,5 @@ #. 50000 #. -#. +#. #. #. @@ -24301,5 +24283,5 @@ #. 50000 #. -#. +#. #. #. @@ -24308,5 +24290,5 @@ #. 50000 #. -#. +#. #. #. @@ -24477,7 +24459,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24491,5 +24473,5 @@ #. 40000 #. -#. +#. #. #. @@ -24499,7 +24481,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24509,5 +24491,5 @@ #. 50000 #. -#. +#. #. #. @@ -24517,5 +24499,5 @@ #. 50000 #. -#. +#. #. #. @@ -24525,5 +24507,5 @@ #. 50000 #. -#. +#. #. #. @@ -24533,5 +24515,5 @@ #. 50000 #. -#. +#. #. #. @@ -24547,5 +24529,5 @@ #. 10000 #. -#. +#. #. #. @@ -24555,5 +24537,5 @@ #. 50000 #. -#. +#. #. #. @@ -24563,5 +24545,5 @@ #. 50000 #. -#. +#. #. #. @@ -24571,5 +24553,5 @@ #. 50000 #. -#. +#. #. #. @@ -24579,5 +24561,5 @@ #. 50000 #. -#. +#. #. #. @@ -24587,5 +24569,5 @@ #. 50000 #. -#. +#. #. #. @@ -24595,5 +24577,5 @@ #. 50000 #. -#. +#. #. #. @@ -24612,5 +24594,5 @@ #. 50000 #. -#. +#. #. #. @@ -24619,5 +24601,5 @@ #. 50000 #. -#. +#. #. #. @@ -24631,5 +24613,5 @@ #. 50000 #. -#. +#. #. #. @@ -24643,5 +24625,5 @@ #. 50000 #. -#. +#. #. #. @@ -24650,5 +24632,5 @@ #. 50000 #. -#. +#. #. #. @@ -24662,5 +24644,5 @@ #. 50000 #. -#. +#. #. #. @@ -24675,5 +24657,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24688,5 +24670,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24700,5 +24682,5 @@ #. 50000 #. -#. +#. #. #. @@ -24712,5 +24694,5 @@ #. 50000 #. -#. +#. #. #. @@ -24719,5 +24701,5 @@ #. 50000 #. -#. +#. #. #. @@ -24726,5 +24708,5 @@ #. 50000 #. -#. +#. #. #. @@ -24738,5 +24720,5 @@ #. 50000 #. -#. +#. #. #. @@ -24746,5 +24728,5 @@ #. 50000 #. -#. +#. #. #. @@ -24753,5 +24735,5 @@ #. 50000 #. -#. +#. #. #. @@ -24760,5 +24742,5 @@ #. 50000 #. -#. +#. #. #. @@ -24767,5 +24749,5 @@ #. 50000 #. -#. +#. #. #. @@ -24775,5 +24757,5 @@ #. 50000 #. -#. +#. #. #. @@ -24784,5 +24766,5 @@ #. 50000 #. -#. +#. #. #. @@ -24792,7 +24774,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24802,5 +24784,5 @@ #. 50000 #. -#. +#. #. #. @@ -24810,5 +24792,5 @@ #. 50000 #. -#. +#. #. #. @@ -24818,5 +24800,5 @@ #. 50000 #. -#. +#. #. #. @@ -24827,5 +24809,5 @@ #. 50000 #. -#. +#. #. #. @@ -24835,5 +24817,5 @@ #. 50000 #. -#. +#. #. #. @@ -24843,5 +24825,5 @@ #. 50000 #. -#. +#. #. #. @@ -24851,5 +24833,5 @@ #. 50000 #. -#. +#. #. #. @@ -24859,5 +24841,5 @@ #. 50000 #. -#. +#. #. #. @@ -24867,5 +24849,5 @@ #. 50000 #. -#. +#. #. #. @@ -24875,5 +24857,5 @@ #. 50000 #. -#. +#. #. #. @@ -24883,5 +24865,5 @@ #. 50000 #. -#. +#. #. #. @@ -24891,5 +24873,5 @@ #. 50000 #. -#. +#. #. #. @@ -24912,7 +24894,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24922,5 +24904,5 @@ #. 50000 #. -#. +#. #. #. @@ -24929,5 +24911,5 @@ #. 50000 #. -#. +#. #. #. @@ -24937,5 +24919,5 @@ #. 50000 #. -#. +#. #. #. @@ -24944,5 +24926,5 @@ #. 50000 #. -#. +#. #. #. @@ -24952,5 +24934,5 @@ #. 50000 #. -#. +#. #. #. @@ -24960,5 +24942,5 @@ #. 50000 #. -#. +#. #. #. @@ -24974,5 +24956,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24983,5 +24965,5 @@ #. 50000 #. -#. +#. #. #. @@ -25000,5 +24982,5 @@ #. 50000 #. -#. +#. #. #. @@ -25008,5 +24990,5 @@ #. 50000 #. -#. +#. #. #. @@ -25019,5 +25001,5 @@ #. 50000 #. -#. +#. #. #. @@ -25035,5 +25017,5 @@ #. 50000 #. -#. +#. #. #. @@ -25042,5 +25024,5 @@ #. 50000 #. -#. +#. #. #. @@ -25049,5 +25031,5 @@ #. 50000 #. -#. +#. #. #. @@ -25056,7 +25038,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25067,5 +25049,5 @@ #. 50000 #. -#. +#. #. #. @@ -25080,5 +25062,5 @@ #. 50000 #. -#. +#. #. #. @@ -25092,5 +25074,5 @@ #. 50000 #. -#. +#. #. #. @@ -25100,5 +25082,5 @@ #. 50000 #. -#. +#. #. #. @@ -25112,5 +25094,5 @@ #. 50000 #. -#. +#. #. #. @@ -25124,5 +25106,5 @@ #. 50000 #. -#. +#. #. #. @@ -25131,7 +25113,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25141,5 +25123,5 @@ #. 50000 #. -#. +#. #. #. @@ -25149,5 +25131,5 @@ #. 50000 #. -#. +#. #. #. @@ -25157,5 +25139,5 @@ #. 50000 #. -#. +#. #. #. @@ -25165,5 +25147,5 @@ #. 50000 #. -#. +#. #. #. @@ -25179,7 +25161,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25194,5 +25176,5 @@ #. 30000 #. -#. +#. #. #. @@ -25207,5 +25189,5 @@ #. 30000 #. -#. +#. #. #. @@ -25220,5 +25202,5 @@ #. 30000 #. -#. +#. #. #. @@ -25233,5 +25215,5 @@ #. 30000 #. -#. +#. #. #. @@ -25246,5 +25228,5 @@ #. 30000 #. -#. +#. #. #. @@ -25259,7 +25241,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -25269,5 +25251,5 @@ #. 50000 #. -#. +#. #. #. @@ -25276,5 +25258,5 @@ #. 50000 #. -#. +#. #. #. @@ -25284,5 +25266,5 @@ #. 50000 #. -#. +#. #. #. @@ -25292,5 +25274,5 @@ #. 50000 #. -#. +#. #. #. @@ -25300,5 +25282,5 @@ #. 50000 #. -#. +#. #. #. @@ -25308,5 +25290,5 @@ #. 50000 #. -#. +#. #. #. @@ -25316,5 +25298,5 @@ #. 50000 #. -#. +#. #. #. @@ -25324,5 +25306,5 @@ #. 50000 #. -#. +#. #. #. @@ -25332,5 +25314,5 @@ #. 50000 #. -#. +#. #. #. @@ -25340,5 +25322,5 @@ #. 50000 #. -#. +#. #. #. @@ -25348,5 +25330,5 @@ #. 50000 #. -#. +#. #. #. @@ -25356,5 +25338,5 @@ #. 50000 #. -#. +#. #. #. @@ -25364,5 +25346,5 @@ #. 50000 #. -#. +#. #. #. @@ -25382,5 +25364,5 @@ #. 50000 #. -#. +#. #. #. @@ -25395,5 +25377,5 @@ #. 50000 #. -#. +#. #. #. @@ -25406,7 +25388,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25416,5 +25398,5 @@ #. 50000 #. -#. +#. #. #. @@ -25424,5 +25406,5 @@ #. 50000 #. -#. +#. #. #. @@ -25432,5 +25414,5 @@ #. 50000 #. -#. +#. #. #. @@ -25440,5 +25422,5 @@ #. 50000 #. -#. +#. #. #. @@ -25448,5 +25430,5 @@ #. 50000 #. -#. +#. #. #. @@ -25456,5 +25438,5 @@ #. 50000 #. -#. +#. #. #. @@ -25464,5 +25446,5 @@ #. 50000 #. -#. +#. #. #. @@ -25472,5 +25454,5 @@ #. 50000 #. -#. +#. #. #. @@ -25480,5 +25462,5 @@ #. 50000 #. -#. +#. #. #. @@ -25488,5 +25470,5 @@ #. 50000 #. -#. +#. #. #. @@ -25496,5 +25478,5 @@ #. 50000 #. -#. +#. #. #. @@ -25504,5 +25486,5 @@ #. 50000 #. -#. +#. #. #. @@ -25512,5 +25494,5 @@ #. 50000 #. -#. +#. #. #. @@ -25520,5 +25502,5 @@ #. 50000 #. -#. +#. #. #. @@ -25539,5 +25521,5 @@ #. 50000 #. -#. +#. #. #. @@ -25551,7 +25533,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25561,5 +25543,5 @@ #. 50000 #. -#. +#. #. #. @@ -25569,5 +25551,5 @@ #. 50000 #. -#. +#. #. #. @@ -25577,5 +25559,5 @@ #. 50000 #. -#. +#. #. #. @@ -25585,5 +25567,5 @@ #. 50000 #. -#. +#. #. #. @@ -25593,5 +25575,5 @@ #. 50000 #. -#. +#. #. #. @@ -25601,5 +25583,5 @@ #. 50000 #. -#. +#. #. #. @@ -25609,5 +25591,5 @@ #. 50000 #. -#. +#. #. #. @@ -25624,5 +25606,5 @@ #. 50000 #. -#. +#. #. #. @@ -25632,5 +25614,5 @@ #. 50000 #. -#. +#. #. #. @@ -25640,5 +25622,5 @@ #. 50000 #. -#. +#. #. #. @@ -25648,5 +25630,5 @@ #. 50000 #. -#. +#. #. #. @@ -25656,5 +25638,5 @@ #. 50000 #. -#. +#. #. #. @@ -25664,5 +25646,5 @@ #. 50000 #. -#. +#. #. #. @@ -25672,5 +25654,5 @@ #. 50000 #. -#. +#. #. #. @@ -25680,5 +25662,5 @@ #. 50000 #. -#. +#. #. #. @@ -25688,5 +25670,5 @@ #. 50000 #. -#. +#. #. #. @@ -25696,5 +25678,5 @@ #. 50000 #. -#. +#. #. #. @@ -25704,5 +25686,5 @@ #. 50000 #. -#. +#. #. #. @@ -25712,5 +25694,5 @@ #. 50000 #. -#. +#. #. #. @@ -25729,5 +25711,5 @@ #. 50000 #. -#. +#. #. #. @@ -25737,5 +25719,5 @@ #. 50000 #. -#. +#. #. #. @@ -25744,5 +25726,5 @@ #. 50000 #. -#. +#. #. #. @@ -25752,5 +25734,5 @@ #. 50000 #. -#. +#. #. #. @@ -25760,5 +25742,5 @@ #. 50000 #. -#. +#. #. #. @@ -25768,5 +25750,5 @@ #. 50000 #. -#. +#. #. #. @@ -25775,5 +25757,5 @@ #. 50000 #. -#. +#. #. #. @@ -25783,5 +25765,5 @@ #. 50000 #. -#. +#. #. #. @@ -25791,5 +25773,5 @@ #. 50000 #. -#. +#. #. #. @@ -25799,5 +25781,5 @@ #. 50000 #. -#. +#. #. #. @@ -25807,5 +25789,5 @@ #. 50000 #. -#. +#. #. #. @@ -25814,5 +25796,5 @@ #. 50000 #. -#. +#. #. #. @@ -25821,5 +25803,5 @@ #. 50000 #. -#. +#. #. #. @@ -25828,5 +25810,5 @@ #. 50000 #. -#. +#. #. #. @@ -25835,5 +25817,5 @@ #. 50000 #. -#. +#. #. #. @@ -25842,5 +25824,5 @@ #. 50000 #. -#. +#. #. #. @@ -25849,5 +25831,5 @@ #. 50000 #. -#. +#. #. #. @@ -25856,5 +25838,5 @@ #. 50000 #. -#. +#. #. #. @@ -25863,5 +25845,5 @@ #. 50000 #. -#. +#. #. #. @@ -25870,5 +25852,5 @@ #. 50000 #. -#. +#. #. #. @@ -25877,5 +25859,5 @@ #. 50000 #. -#. +#. #. #. @@ -25884,5 +25866,5 @@ #. 50000 #. -#. +#. #. #. @@ -25891,5 +25873,5 @@ #. 50000 #. -#. +#. #. #. @@ -25898,5 +25880,5 @@ #. 50000 #. -#. +#. #. #. @@ -25906,5 +25888,5 @@ #. 50000 #. -#. +#. #. #. @@ -25914,5 +25896,5 @@ #. 50000 #. -#. +#. #. #. @@ -25922,5 +25904,5 @@ #. 50000 #. -#. +#. #. #. @@ -25930,5 +25912,5 @@ #. 50000 #. -#. +#. #. #. @@ -25938,5 +25920,5 @@ #. 50000 #. -#. +#. #. #. @@ -25946,5 +25928,5 @@ #. 50000 #. -#. +#. #. #. @@ -25954,5 +25936,5 @@ #. 50000 #. -#. +#. #. #. @@ -25962,5 +25944,5 @@ #. 50000 #. -#. +#. #. #. @@ -25970,5 +25952,5 @@ #. 50000 #. -#. +#. #. #. @@ -25979,5 +25961,5 @@ #. 50000 #. -#. +#. #. #. @@ -25987,5 +25969,5 @@ #. 50000 #. -#. +#. #. #. @@ -25995,5 +25977,5 @@ #. 50000 #. -#. +#. #. #. @@ -26003,5 +25985,5 @@ #. 50000 #. -#. +#. #. #. @@ -26011,5 +25993,5 @@ #. 50000 #. -#. +#. #. #. @@ -26019,5 +26001,5 @@ #. 50000 #. -#. +#. #. #. @@ -26027,5 +26009,5 @@ #. 50000 #. -#. +#. #. #. @@ -26035,5 +26017,5 @@ #. 50000 #. -#. +#. #. #. @@ -26043,5 +26025,5 @@ #. 50000 #. -#. +#. #. #. @@ -26051,5 +26033,5 @@ #. 50000 #. -#. +#. #. #. @@ -26059,5 +26041,5 @@ #. 50000 #. -#. +#. #. #. @@ -26067,5 +26049,5 @@ #. 50000 #. -#. +#. #. #. @@ -26075,5 +26057,5 @@ #. 50000 #. -#. +#. #. #. @@ -26083,5 +26065,5 @@ #. 50000 #. -#. +#. #. #. @@ -26091,5 +26073,5 @@ #. 50000 #. -#. +#. #. #. @@ -26099,5 +26081,5 @@ #. 50000 #. -#. +#. #. #. @@ -26107,5 +26089,5 @@ #. 50000 #. -#. +#. #. #. @@ -26115,5 +26097,5 @@ #. 50000 #. -#. +#. #. #. @@ -26123,5 +26105,5 @@ #. 50000 #. -#. +#. #. #. @@ -26130,5 +26112,5 @@ #. 50000 #. -#. +#. #. #. @@ -26160,5 +26142,5 @@ #. 50000 #. -#. +#. #. #. @@ -26168,5 +26150,5 @@ #. 50000 #. -#. +#. #. #. @@ -26176,7 +26158,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26191,5 +26173,5 @@ #. 50000 #. -#. +#. #. #. @@ -26199,5 +26181,5 @@ #. 50000 #. -#. +#. #. #. @@ -26207,5 +26189,5 @@ #. 50000 #. -#. +#. #. #. @@ -26215,5 +26197,5 @@ #. 50000 #. -#. +#. #. #. @@ -26223,5 +26205,5 @@ #. 50000 #. -#. +#. #. #. @@ -26231,5 +26213,5 @@ #. 50000 #. -#. +#. #. #. @@ -26239,5 +26221,5 @@ #. 50000 #. -#. +#. #. #. @@ -26253,7 +26235,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -26263,5 +26245,5 @@ #. 50000 #. -#. +#. #. #. @@ -26271,5 +26253,5 @@ #. 50000 #. -#. +#. #. #. @@ -26279,5 +26261,5 @@ #. 50000 #. -#. +#. #. #. @@ -26287,5 +26269,5 @@ #. 50000 #. -#. +#. #. #. @@ -26295,5 +26277,5 @@ #. 50000 #. -#. +#. #. #. @@ -26303,5 +26285,5 @@ #. 50000 #. -#. +#. #. #. @@ -26311,5 +26293,5 @@ #. 50000 #. -#. +#. #. #. @@ -26319,5 +26301,5 @@ #. 50000 #. -#. +#. #. #. @@ -26327,5 +26309,5 @@ #. 50000 #. -#. +#. #. #. @@ -26335,5 +26317,5 @@ #. 50000 #. -#. +#. #. #. @@ -26343,5 +26325,5 @@ #. 50000 #. -#. +#. #. #. @@ -26351,5 +26333,5 @@ #. 50000 #. -#. +#. #. #. @@ -26359,5 +26341,5 @@ #. 50000 #. -#. +#. #. #. @@ -26367,5 +26349,5 @@ #. 50000 #. -#. +#. #. #. @@ -26375,5 +26357,5 @@ #. 50000 #. -#. +#. #. #. @@ -26383,5 +26365,5 @@ #. 50000 #. -#. +#. #. #. @@ -26391,5 +26373,5 @@ #. 50000 #. -#. +#. #. #. @@ -26399,5 +26381,5 @@ #. 50000 #. -#. +#. #. #. @@ -26407,5 +26389,5 @@ #. 50000 #. -#. +#. #. #. @@ -26415,5 +26397,5 @@ #. 50000 #. -#. +#. #. #. @@ -26423,5 +26405,5 @@ #. 50000 #. -#. +#. #. #. @@ -26431,5 +26413,5 @@ #. 50000 #. -#. +#. #. #. @@ -26439,5 +26421,5 @@ #. 50000 #. -#. +#. #. #. @@ -26447,5 +26429,5 @@ #. 50000 #. -#. +#. #. #. @@ -26455,5 +26437,5 @@ #. 50000 #. -#. +#. #. #. @@ -26463,5 +26445,5 @@ #. 50000 #. -#. +#. #. #. @@ -26471,5 +26453,5 @@ #. 50000 #. -#. +#. #. #. @@ -26479,5 +26461,5 @@ #. 50000 #. -#. +#. #. #. @@ -26487,5 +26469,5 @@ #. 50000 #. -#. +#. #. #. @@ -26495,5 +26477,5 @@ #. 50000 #. -#. +#. #. #. @@ -26503,5 +26485,5 @@ #. 50000 #. -#. +#. #. #. @@ -26511,5 +26493,5 @@ #. 50000 #. -#. +#. #. #. @@ -26519,5 +26501,5 @@ #. 50000 #. -#. +#. #. #. @@ -26527,5 +26509,5 @@ #. 50000 #. -#. +#. #. #. @@ -26535,5 +26517,5 @@ #. 50000 #. -#. +#. #. #. @@ -26543,5 +26525,5 @@ #. 50000 #. -#. +#. #. #. @@ -26551,5 +26533,5 @@ #. 50000 #. -#. +#. #. #. @@ -26559,5 +26541,5 @@ #. 50000 #. -#. +#. #. #. @@ -26567,5 +26549,5 @@ #. 50000 #. -#. +#. #. #. @@ -26575,5 +26557,5 @@ #. 50000 #. -#. +#. #. #. @@ -26583,5 +26565,5 @@ #. 50000 #. -#. +#. #. #. @@ -26591,5 +26573,5 @@ #. 50000 #. -#. +#. #. #. @@ -26625,7 +26607,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26635,5 +26617,5 @@ #. 50000 #. -#. +#. #. #. @@ -26643,5 +26625,5 @@ #. 50000 #. -#. +#. #. #. @@ -26651,5 +26633,5 @@ #. 50000 #. -#. +#. #. #. @@ -26659,5 +26641,5 @@ #. 50000 #. -#. +#. #. #. @@ -26667,5 +26649,5 @@ #. 50000 #. -#. +#. #. #. @@ -26675,5 +26657,5 @@ #. 50000 #. -#. +#. #. #. @@ -26683,5 +26665,5 @@ #. 50000 #. -#. +#. #. #. @@ -26698,5 +26680,5 @@ #. 50000 #. -#. +#. #. #. @@ -26706,5 +26688,5 @@ #. 50000 #. -#. +#. #. #. @@ -26714,5 +26696,5 @@ #. 50000 #. -#. +#. #. #. @@ -26722,5 +26704,5 @@ #. 50000 #. -#. +#. #. #. @@ -26730,5 +26712,5 @@ #. 50000 #. -#. +#. #. #. @@ -26738,5 +26720,5 @@ #. 50000 #. -#. +#. #. #. @@ -26747,5 +26729,5 @@ #. 50000 #. -#. +#. #. #. @@ -26755,5 +26737,5 @@ #. 50000 #. -#. +#. #. #. @@ -26763,5 +26745,5 @@ #. 40000 #. -#. +#. #. #. @@ -26771,5 +26753,5 @@ #. 50000 #. -#. +#. #. #. @@ -26778,5 +26760,5 @@ #. 40000 #. -#. +#. #. #. @@ -26785,5 +26767,5 @@ #. 40000 #. -#. +#. #. #. @@ -26801,7 +26783,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26811,5 +26793,5 @@ #. 50000 #. -#. +#. #. #. @@ -26819,5 +26801,5 @@ #. 50000 #. -#. +#. #. #. @@ -26827,5 +26809,5 @@ #. 50000 #. -#. +#. #. #. @@ -26835,5 +26817,5 @@ #. 50000 #. -#. +#. #. #. @@ -26843,5 +26825,5 @@ #. 50000 #. -#. +#. #. #. @@ -26851,5 +26833,5 @@ #. 50000 #. -#. +#. #. #. @@ -26859,5 +26841,5 @@ #. 50000 #. -#. +#. #. #. @@ -26867,5 +26849,5 @@ #. 50000 #. -#. +#. #. #. @@ -26875,5 +26857,5 @@ #. 50000 #. -#. +#. #. #. @@ -26892,5 +26874,5 @@ #. 50000 #. -#. +#. #. #. @@ -26904,5 +26886,5 @@ #. 50000 #. -#. +#. #. #. @@ -26916,5 +26898,5 @@ #. 50000 #. -#. +#. #. #. @@ -26924,5 +26906,5 @@ #. 50000 #. -#. +#. #. #. @@ -26936,5 +26918,5 @@ #. 50000 #. -#. +#. #. #. @@ -26948,5 +26930,5 @@ #. 50000 #. -#. +#. #. #. @@ -26960,6 +26942,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26969,5 +26951,5 @@ #. 50000 #. -#. +#. #. #. @@ -26981,5 +26963,5 @@ #. 50000 #. -#. +#. #. #. @@ -26993,5 +26975,5 @@ #. 50000 #. -#. +#. #. #. @@ -27005,5 +26987,5 @@ #. 50000 #. -#. +#. #. #. @@ -27017,5 +26999,5 @@ #. 50000 #. -#. +#. #. #. @@ -27029,5 +27011,5 @@ #. 50000 #. -#. +#. #. #. @@ -27037,7 +27019,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27047,5 +27029,5 @@ #. 50000 #. -#. +#. #. #. @@ -27055,5 +27037,5 @@ #. 50000 #. -#. +#. #. #. @@ -27063,5 +27045,5 @@ #. 50000 #. -#. +#. #. #. @@ -27071,5 +27053,5 @@ #. 50000 #. -#. +#. #. #. @@ -27086,5 +27068,5 @@ #. 50000 #. -#. +#. #. #. @@ -27097,5 +27079,5 @@ #. 50000 #. -#. +#. #. #. @@ -27109,5 +27091,5 @@ #. 50000 #. -#. +#. #. #. @@ -27121,5 +27103,5 @@ #. 50000 #. -#. +#. #. #. @@ -27133,5 +27115,5 @@ #. 50000 #. -#. +#. #. #. @@ -27142,5 +27124,5 @@ #. 50000 #. -#. +#. #. #. @@ -27150,5 +27132,5 @@ #. 50000 #. -#. +#. #. #. @@ -27158,5 +27140,5 @@ #. 50000 #. -#. +#. #. #. @@ -27166,5 +27148,5 @@ #. 50000 #. -#. +#. #. #. @@ -27174,5 +27156,5 @@ #. 50000 #. -#. +#. #. #. @@ -27189,5 +27171,5 @@ #. 50000 #. -#. +#. #. #. @@ -27201,5 +27183,5 @@ #. 50000 #. -#. +#. #. #. @@ -27213,5 +27195,5 @@ #. 50000 #. -#. +#. #. #. @@ -27225,5 +27207,5 @@ #. 50000 #. -#. +#. #. #. @@ -27237,5 +27219,5 @@ #. 50000 #. -#. +#. #. #. @@ -27249,5 +27231,5 @@ #. 50000 #. -#. +#. #. #. @@ -27256,7 +27238,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27266,5 +27248,5 @@ #. 50000 #. -#. +#. #. #. @@ -27274,5 +27256,5 @@ #. 50000 #. -#. +#. #. #. @@ -27282,5 +27264,5 @@ #. 50000 #. -#. +#. #. #. @@ -27290,5 +27272,5 @@ #. 50000 #. -#. +#. #. #. @@ -27298,5 +27280,5 @@ #. 50000 #. -#. +#. #. #. @@ -27306,5 +27288,5 @@ #. 50000 #. -#. +#. #. #. @@ -27314,5 +27296,5 @@ #. 50000 #. -#. +#. #. #. @@ -27329,7 +27311,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -27339,5 +27321,5 @@ #. 50000 #. -#. +#. #. #. @@ -27347,5 +27329,5 @@ #. 50000 #. -#. +#. #. #. @@ -27355,5 +27337,5 @@ #. 50000 #. -#. +#. #. #. @@ -27363,5 +27345,5 @@ #. 50000 #. -#. +#. #. #. @@ -27377,5 +27359,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -27424,5 +27406,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27432,5 +27414,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27440,5 +27422,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27448,5 +27430,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27456,5 +27438,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27464,5 +27446,5 @@ #. 200000000 #. -#. +#. #. #. @@ -27472,5 +27454,5 @@ #. 50000 #. -#. +#. #. #. @@ -27480,5 +27462,5 @@ #. 50000 #. -#. +#. #. #. @@ -27488,5 +27470,5 @@ #. 50000 #. -#. +#. #. #. @@ -27496,5 +27478,5 @@ #. 50000 #. -#. +#. #. #. @@ -27504,5 +27486,5 @@ #. 50000 #. -#. +#. #. #. @@ -27512,5 +27494,5 @@ #. 50000 #. -#. +#. #. #. @@ -27530,5 +27512,5 @@ #. 50000 #. -#. +#. #. #. @@ -27537,5 +27519,5 @@ #. 50000 #. -#. +#. #. #. @@ -27544,5 +27526,5 @@ #. 50000 #. -#. +#. #. #. @@ -27551,5 +27533,5 @@ #. 40000 #. -#. +#. #. #. @@ -27558,5 +27540,5 @@ #. 40000 #. -#. +#. #. #. @@ -27565,5 +27547,5 @@ #. 40000 #. -#. +#. #. #. @@ -27658,5 +27640,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -27664,28 +27646,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 @@ -27800,5 +27782,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27811,5 +27793,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27834,6 +27816,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27842,6 +27824,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27856,6 +27838,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 @@ -27869,6 +27851,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 @@ -27888,6 +27870,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27911,6 +27893,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 @@ -27923,10 +27905,124 @@ msgstr "Sicily - Italy" +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná." + +#~ msgid "Download all incomplete ways and nodes in relation" +#~ msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii" + +#~ msgid "" +#~ "Enable to upload all changes in one request, disable to use one request " +#~ "per changed primitive" +#~ msgstr "" +#~ "Umožniť nahranie všetkých zmien v jednej požiadavke, vypnúť použitie " +#~ "jednej požiadavky na zmenené pôvodné" + +#~ msgid "Images for {0}" +#~ msgstr "Obrázky pre {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Čítať GPX..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Žiadny čas pre bod {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Nedá sa prečítať čas \"{0}\" z bodu {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Nenájdené žiadne obrázky s časovými značkami." + +#~ msgid "GPS start: {0}" +#~ msgstr "Štart GPS: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "Koniec GPS: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "súčastná odchylka: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "rozdiel časových pásiem: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} vo vnútry stopy (track)." + +#~ msgid "Sync clock" +#~ msgstr "Synchronizovať hodiny" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Dáta v súbore \"{0}\" nemohli byť parsované." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "V súbore \"{0}\" nie je časová značka EXIF" + +#~ msgid "Image" +#~ msgstr "Obrázok" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Časová zóna GPS zariadenia (rozdiel od fotografie)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synchronizovať čas s GPS zariadením" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Zadaný čas nemôže byť rozparsovaný" + +#~ msgid "" +#~ "WARNING: no API version defined for data to upload. Falling back to " +#~ "version 0.6" +#~ msgstr "" +#~ "VAROVANIE: žiadna API verzia vymedzená pre dáta na nahratie. Ustúpiť do " +#~ "verzie 0.6" + +#~ 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 "" +#~ "Varovanie: nastavenie ''{0}'' alebo api verzia ''{1}'' z dátovej sady " +#~ "požadujú použiť rozdielne nahratie , ale API nie je schopného ovládať." +#~ "Ignorujem rozdielne nahrávanie." + +#~ msgid "" +#~ "Loading of {0} plugin was requested. This plugin is no longer required." +#~ msgstr "" +#~ "Načítanie z {0} pluginov bolo požadované. Tento plugin nie je ďalej " +#~ "potrebný." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - obrázky s geoznačkami" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Otvoriť obrázky s AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "možnosti pre osmarender" + +#~ msgid "Group common Address Interpolation inputs in a single dialog," +#~ msgstr "Zoskupiť bežné Address Interpolation vstupy do jedného dialógu." + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "Ďalší geotag(GPS poloha) plugin pre JOSM. Zľaďované obrázky s GPS " +#~ "stopami, alebo import EXIF geotagged(GPS poloha) obrázkov." + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "Niekoľko pomôcok(utilities) ktoré vám uľahčia život(prácu): napr. " +#~ "zjednodušenie cesty, spojiť plochy, skok na pozíciu." + #~ msgid "Move" #~ msgstr "Presunúť" -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Prosím najskôr zadajte požadované koordináty." - #~ msgid "No document open so nothing to save." #~ msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený." @@ -27956,5 +28052,4 @@ #~ msgstr "Neboli importované žiadne dáta." -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Chyba pri načítaní stránky {0}" @@ -27967,6 +28062,6 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" #~ "Skúste aktualizovať na najnovšiu verziu tohoto doplnku (pluginu) pred " @@ -27976,5 +28071,4 @@ #~ msgstr "Nájdený element mimo cesty." -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Vynecháva sa cesta pretože obsahuje body ktoré neexistujú: {0}\n" @@ -27984,6 +28078,6 @@ #~ "some time." #~ msgstr "" -#~ "Server vrátil vnútornú chybu. Skúste to za chvíľu znovu alebo skúste zmenšiť " -#~ "oblasť." +#~ "Server vrátil vnútornú chybu. Skúste to za chvíľu znovu alebo skúste " +#~ "zmenšiť oblasť." #~ msgid " has zero ref" @@ -28000,9 +28094,7 @@ #~ "Môžete použiť koliesko myši alebo Ctrl+Šípky pre zväčšenie, alebo posun" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Použiť prednastavenie \"{0}\" zo skupiny \"{1}\"" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Použiť prednastavenie \"{0}\"" @@ -28033,11 +28125,10 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" #~ "Vrátiť stav všetkých vybratých objektov na verziu vybratú zo zoznamu " #~ "histórie." -#, java-format #~ msgid "Layers: {0}" #~ msgstr "Vrstvy: {0}" @@ -28047,6 +28138,6 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" #~ "Interná chyba: nemôžem overiť podmienky pre žiadne vrstvy. Hlásim chybu." @@ -28059,5 +28150,6 @@ #~ msgid "Please select one or more closed ways of at least four nodes." -#~ msgstr "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi." +#~ msgstr "" +#~ "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi." #~ msgid "Only one node selected" @@ -28080,5 +28172,4 @@ #~ msgstr "Súbor nebol nájdený" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Nemôžem otvoríť adresár s nastavením: {0}" @@ -28090,12 +28181,7 @@ #~ msgstr "Prihlasovacie meno (email) k OSM účtu." -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Chyba pri mazaní súboru pluginu: {0}" - #~ msgid "Plugin already exists" #~ msgstr "Plugin už existuje" -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Nemôžem stiahnuť plugin: {0} z {1}" @@ -28104,5 +28190,4 @@ #~ msgstr "Spojenie konfliktov" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Konflikty: {0}" @@ -28114,5 +28199,4 @@ #~ msgstr "Obnoviť obsah výberu." -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -28139,5 +28223,4 @@ #~ msgstr "Zobraziť Stav Dlaždíc" -#, java-format #~ msgid "requested: {0}" #~ msgstr "požadovaný: {0}" @@ -28188,5 +28271,4 @@ #~ msgstr "Overovať konkrétny výber, alebo kompletnú dátovu sadu." -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Prosíme napíšte chybovú správu v {0}" @@ -28251,10 +28333,10 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" #~ "Upozornenie: Heslo je uložené v nešifrovanej podobe v konfiguračnom " -#~ "súbore.
Heslo sa prenáša v nešifrovanej podobe v URL na " -#~ "server.
Nepoužívajte dôležité heslo." +#~ "súbore.
Heslo sa prenáša v nešifrovanej podobe v URL na server." +#~ "
Nepoužívajte dôležité heslo." #~ msgid "Rotate" @@ -28267,5 +28349,4 @@ #~ msgstr "rôzne" -#, java-format #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "Vyriešiť {0} konfliktov v {1} objektoch." @@ -28292,5 +28373,4 @@ #~ msgstr "pozícia (miesto)" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28322,8 +28402,4 @@ #~ "a začnite v novej vrstve a v novej zóne." -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Zmazať {1} {0}" - #~ msgid "Conflicting relation" #~ msgstr "Konfliktné vzťahy (relation)" @@ -28360,11 +28436,10 @@ #~ msgstr "Metacarta Map Rectifier(prekresľovač) obrázka id" -#, java-format #~ msgid "rectifier id={0}" #~ msgstr "prekresľovač id={0}" #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -28381,6 +28456,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example,replacing 73 with your image id: \n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28389,6 +28464,6 @@ #~ "use." #~ msgstr "" -#~ "Môžete pridať, upravovať a zmazať WMS položky v nastaveniach pre WMS plugin -" -#~ " zmeny sa prejavia aj vo WMS menu.\n" +#~ "Môžete pridať, upravovať a zmazať WMS položky v nastaveniach pre WMS " +#~ "plugin - zmeny sa prejavia aj vo WMS menu.\n" #~ "\n" #~ "Môžete zmeny urobiť aj ručne v hlavnom nastavení, použite nasledujúci " @@ -28402,6 +28477,6 @@ #~ "format=image/jpeg\n" #~ "\n" -#~ "Pre Metacarta's Map Rectifier(prekresľovač " -#~ "http://labs.metacarta.com/rectifier/ , potrebujete iba príslušný 'id'.\n" +#~ "Pre Metacarta's Map Rectifier(prekresľovač http://labs.metacarta.com/" +#~ "rectifier/ , potrebujete iba príslušný 'id'.\n" #~ "Pridať Metacarta Map Rectifier položku v menu, ručne vytvoriť URL ako v " #~ "tomto príklade,nahradiť 73 s vašim id obrázka:\n" @@ -28409,12 +28484,13 @@ #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" #~ "\n" -#~ "Poznánka: Uistite sa či je možné obrázok použiť, pre autorské práva, ak máte " -#~ "pochybnosť, nepoužite ho." - -#, java-format +#~ "Poznánka: Uistite sa či je možné obrázok použiť, pre autorské práva, ak " +#~ "máte pochybnosť, nepoužite ho." + #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" -#~ "Plugin {0} sa zdá byť poškodený, alebo ho nie je možné automaticky stiahnuť." +#~ "Plugin {0} sa zdá byť poškodený, alebo ho nie je možné automaticky " +#~ "stiahnuť." #~ msgid "Portcullis" @@ -28436,5 +28512,4 @@ #~ msgstr "Zobraziť panel autorov(spracovateľov)" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Autori(spracovatelia): {0}" @@ -28460,5 +28535,4 @@ #~ "the config option 'pluginmanager.warntime'.)" -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -28484,6 +28558,6 @@ #~ msgstr "Vybrať Tableau d'Assemblage" -#, java-format -#~ msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" #~ msgstr "" #~ "Lambert zóna {0} v cache je nekompatibilná s aktuálnou Lambert zónou {1}" @@ -28495,5 +28569,4 @@ #~ msgstr "Odstrániť označené" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Uvedený plugin požaduje aktualizovať JOSM: {0}." @@ -28520,5 +28593,4 @@ #~ msgstr "Posunúť dole" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Editor relácie: {0}" @@ -28534,13 +28606,11 @@ #~ "nahraté elementy majú zaznamenaný priebeh(history)." -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " #~ "continue?" #~ msgstr "" -#~ "Táto činnosť vyžaduje {0} individuálne požiadavky na stiahnutie. Prajete si " -#~ "pokračovať?" - -#, java-format +#~ "Táto činnosť vyžaduje {0} individuálne požiadavky na stiahnutie. Prajete " +#~ "si pokračovať?" + #~ msgid "Change the projection to {0} first." #~ msgstr "Najskôr zmente projekciu na {0}." @@ -28550,6 +28620,6 @@ #~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You can " -#~ "adjust the sliders to manually match the photos." +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." #~ msgstr "" #~ "Stala sa nejaká chyba, pri skúške či sa hodia fotky ku GPX stope. Môžete " @@ -28581,10 +28651,10 @@ #~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to selected " -#~ "user, opens browser showing selected author profile page." +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." #~ msgstr "" -#~ "Nástroje na prácu s autormi/ používateľmi. Výber mapových dát, ktoré patria " -#~ "vybratému používateľovi, otvoriť prehliadač so zobrazenou vybratou stránkou " -#~ "profilu autora." +#~ "Nástroje na prácu s autormi/ používateľmi. Výber mapových dát, ktoré " +#~ "patria vybratému používateľovi, otvoriť prehliadač so zobrazenou vybratou " +#~ "stránkou profilu autora." #~ msgid "Directly load TCX files from JOSM." @@ -28593,15 +28663,14 @@ #~ msgid "" #~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to OSM " -#~ "eg. deleting uninteresting parts of track." +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." #~ msgstr "" -#~ "Hlavná vlastnosť pluginu je možnosť vymazať body z GPx stopy (track). Tento " -#~ "plugin môže byť použitý k príprave stôp (track) pre nahratie na OSM eg. " -#~ "vymazaním nezaujímavých častí stopy (track)" +#~ "Hlavná vlastnosť pluginu je možnosť vymazať body z GPx stopy (track). " +#~ "Tento plugin môže byť použitý k príprave stôp (track) pre nahratie na OSM " +#~ "eg. vymazaním nezaujímavých častí stopy (track)" #~ msgid "Remove route nodes" #~ msgstr "Odstrániť trasové body" -#, java-format #~ msgid "{0} Plugin successfully updated. Please restart JOSM." #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." @@ -28626,6 +28695,6 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" #~ "Zvolené cesty patria do iného vzťahu (relation). Naozaj ich chcete spojiť?" @@ -28644,6 +28713,6 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" #~ "Zvolené body majú rozdielne vzťahové(relation) členy. Napriek tomu ich " @@ -28657,5 +28726,6 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" #~ "Žiadne údaje pre uloženie sú nenájdené. Máte otvorenú, alebo načítanú " @@ -28668,5 +28738,4 @@ #~ msgstr "V priebehu sťahovania nastala nasledujúca chyba :" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28709,15 +28778,13 @@ #~ "about the problem." #~ msgstr "" -#~ "Doplnok nie je možné odstrániť. Prosím informujte o tomto probléme vývojárov " -#~ "JOSM." +#~ "Doplnok nie je možné odstrániť. Prosím informujte o tomto probléme " +#~ "vývojárov JOSM." #~ msgid "Open a layer first (GPX, OSM, cache)" #~ msgstr "Najprv vytvorte nejakú vrstvu (GPX, OSM, cache)" -#, java-format #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." #~ msgstr "Neočakávaný \"type\" člena {0} relácie {1} (hodnota {2})" -#, java-format #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "Obrázok na ceste {0} neexistuje alebo sa neda prečítať." @@ -28726,5 +28793,4 @@ #~ msgstr "% lon:" -#, java-format #~ msgid "Resolve conflicts in member list of of relation {0}" #~ msgstr "Vyriešte rozpor v poradovom čísle relácie {0}" @@ -28751,5 +28817,4 @@ #~ msgstr "Nahrávanie na OSM API neúspešné" -#, java-format #~ msgid "Checking whether node {0} is gone ..." #~ msgstr "Kontrolujem či body {0} sú úplné(gone) ..." @@ -28761,5 +28826,4 @@ #~ msgstr "Obnovovanie cesty..." -#, java-format #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Kontrolujem či sú závislosti {0} is gone ..." @@ -28768,22 +28832,22 @@ #~ msgstr "Aktualizácia neúspešná" -#, java-format #~ msgid "" -#~ "The OSM primitive with id {0} has been deleted
on " -#~ "the server by another mapper.

Click {1} to keep your " -#~ "primitive and ignore the deleted state.
Your primitive will be assigend a " -#~ "new id.
Click {2} to accept the state on the server and " -#~ "to delete your primitive.
Click {3} to cancel.
" +#~ "The OSM primitive with id {0} has been " +#~ "deleted
on the server by another mapper.

Click {1} to keep your primitive and ignore the deleted state.
Your " +#~ "primitive will be assigend a new id.
Click {2} to " +#~ "accept the state on the server and to delete your primitive.
Click " +#~ "{3} to cancel.
" #~ msgstr "" -#~ "OSM pôvodné s id {0} bolo vymazané
na servery iným " -#~ "mapérom.

Click {1} pomechať vaše pôvodné a ignorovať " -#~ "vymazaný stav.
Vašemu pôvodnému bode priradené nové id.
Click " -#~ "{2} prijať stav na servery a vymazať váš pôvodný " -#~ "stav.
Click {3} zrušiť.
" - -#, java-format +#~ "OSM pôvodné s id {0} bolo vymazané
na servery " +#~ "iným mapérom.

Click {1} pomechať vaše pôvodné a " +#~ "ignorovať vymazaný stav.
Vašemu pôvodnému bode priradené nové id." +#~ "
Click {2} prijať stav na servery a vymazať váš " +#~ "pôvodný stav.
Click {3} zrušiť.
" + #~ msgid "" -#~ "There are {0} primitives
selected for individual " -#~ "update. Please reduce the selection
to max. {1} primitives." +#~ "There are {0} primitives
selected for " +#~ "individual update. Please reduce the selection
to max. {1} primitives." +#~ "" #~ msgstr "" #~ "Sú tam {0} pôvodné
vybrané pre individuálnu " @@ -28799,5 +28863,4 @@ #~ msgstr "Chýbajúce pôvodné" -#, java-format #~ msgid "" #~ "Uploading failed because a primitive you tried " @@ -28806,6 +28869,6 @@ #~ msgstr "" #~ "Aktualizácia neúspešná pretože pôvodné sa " -#~ "snaží
zmazať na servery už zmazané.

Chybová správa " -#~ "je:
{0}" +#~ "snaží
zmazať na servery už zmazané.

Chybová správa je:
{0}" #~ msgid "Conflict detected" @@ -28837,6 +28900,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -28852,6 +28915,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example, replacing 73 with your image id:\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28863,6 +28926,6 @@ #~ "toto sa potom zobrazí vo WMS menu.\n" #~ "\n" -#~ "Môžete to tiež urobiť manuálne v Advanced Preferences, Použite nasledujúcu " -#~ "schému:\n" +#~ "Môžete to tiež urobiť manuálne v Advanced Preferences, Použite " +#~ "nasledujúcu schému:\n" #~ "wmsplugin.url.1.name=Landsat\n" #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" @@ -28873,8 +28936,8 @@ #~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" #~ "\n" -#~ "Pre Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ " -#~ ",potrebujete iba aktuálne vstupné 'id'.\n" -#~ "Pre pridanie Metacarta Map Rectifier položky menu, manuálne vytvorte URL ako " -#~ "v tomto príklade, položenie 73 vášho obrázka id:\n" +#~ "Pre Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ ," +#~ "potrebujete iba aktuálne vstupné 'id'.\n" +#~ "Pre pridanie Metacarta Map Rectifier položky menu, manuálne vytvorte URL " +#~ "ako v tomto príklade, položenie 73 vášho obrázka id:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -28883,9 +28946,8 @@ #~ "máte pochybnosti, nepoužite ich." -#, java-format #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\"" - -#, java-format +#~ msgstr "" +#~ "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\"" + #~ msgid "" #~ "WARNING: launching browser windows for the first {0} of {1} selected " @@ -28901,9 +28963,7 @@ #~ msgstr "API inicializácia neúspešná" -#, java-format #~ msgid "removing reference from way {0}" #~ msgstr "vybranie odkazu z cesty {0}" -#, java-format #~ msgid "Failed to load history from the server. Details:
{0}" #~ msgstr "Chybný priebeh nahrávania zo servera. Detaily:
{0}" @@ -28915,15 +28975,10 @@ #~ msgstr "WGS84 Geographisch" -#, java-format #~ msgid "Layer {0} must be in list of layers" #~ msgstr "Vrstva {0} musí byť v zozname vrstiev" -#~ msgid "Sort" -#~ msgstr "Triediť" - #~ msgid "Sort the selected relation members or the whole list" #~ msgstr "Roztriediť vybrané relačné členy, alebo celý zoznam" -#, java-format #~ msgid "Members: {0} (linked: {1})" #~ msgstr "Členy: {0} (spojenie: {1})" @@ -28941,9 +28996,7 @@ #~ msgstr "Pridať nový XML zdroj do zoznamu." -#, java-format #~ msgid "Remove relation member {0} {1}" #~ msgstr "Odstrániť člena relácie {0} {1}" -#, java-format #~ msgid "The XML source (URL or filename) for {0} definition files." #~ msgstr "The XML zdroj (URL alebo názov súboru)pre {0} rozlíšenie súborov." @@ -28961,10 +29014,10 @@ #~ msgstr "Konflikt je vytvorený" -#, java-format #~ msgid "" -#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " +#~ "{0}" #~ msgstr "" -#~ "Chytená bezpečnostné výnimka pre setAlwaysOnTop().Ignorujem. Výnimka bola: " -#~ "{0}" +#~ "Chytená bezpečnostné výnimka pre setAlwaysOnTop().Ignorujem. Výnimka " +#~ "bola: {0}" #~ msgid "Linked" @@ -28983,20 +29036,17 @@ #~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" #~ msgstr "" -#~ "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s " -#~ "Main.getCurrentDataSet()" - -#, java-format +#~ "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main." +#~ "getCurrentDataSet()" + #~ msgid "" #~ "Failed to access system property ''{0}'' for security reasons. Exception " #~ "was: {1}" #~ msgstr "" -#~ "Neúspešný prístup k systémovej vlastnosti ''{0}'' z bezpečnostného dôvodu. " -#~ "Výnimka bola: {1}" - -#, java-format +#~ "Neúspešný prístup k systémovej vlastnosti ''{0}'' z bezpečnostného " +#~ "dôvodu. Výnimka bola: {1}" + #~ msgid "Unknown file extension for file ''{0}''" #~ msgstr "Neznáme rozšírenie súboru pre súbor ''{0}''" -#, java-format #~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" #~ msgstr "" @@ -29006,5 +29056,4 @@ #~ msgstr "Nemôžem vyhľadávať, pretože nie sú načítané dáta." -#, java-format #~ msgid "" #~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" @@ -29019,24 +29068,20 @@ #~ "Výnimka: {0}" -#, java-format #~ msgid "" #~ "Warning: failed to bring extended dialog always on top. Exception: {0}" #~ msgstr "" -#~ "Varovanie: neúspešné otvorenie rozšíreného dialógu vždy na vrchu. Výnimka: " -#~ "{0}" - -#, java-format +#~ "Varovanie: neúspešné otvorenie rozšíreného dialógu vždy na vrchu. " +#~ "Výnimka: {0}" + #~ msgid "" -#~ "Warning: failed to put ''please wait dialog'' always on top. Exception was: " -#~ "{0}" +#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " +#~ "was: {0}" #~ msgstr "" #~ "Varovanie: neúspešná voľba zobraziť ''prosím počkajte'' vždy na vrchu. " #~ "Výnimky boli: {0}" -#, java-format #~ msgid "Do you really want to delete layer ''{0}''?" #~ msgstr "Naozaj chcete vymazať vrstvu ''{0}''?" -#, java-format #~ msgid "Deleting layer {0} of {1}" #~ msgstr "Vymazávaná vrstva {0} z {1}" @@ -29045,12 +29090,10 @@ #~ msgstr "Zmazať všetko" -#, java-format #~ msgid "" #~ "Warning: failed to put properties dialog always on top. Exception was: {0}" #~ msgstr "" -#~ "Varovanie: neúspešné umiestnenie dialógového okna nastavení vždy na vrchu. " -#~ "Výnimka bola: {0}" - -#, java-format +#~ "Varovanie: neúspešné umiestnenie dialógového okna nastavení vždy na " +#~ "vrchu. Výnimka bola: {0}" + #~ msgid "" #~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" @@ -29059,5 +29102,4 @@ #~ "Výnimka bola: {0}" -#, java-format #~ msgid "" #~ "Warning: failed to put history browser always on top. Exception was: {0}" @@ -29066,13 +29108,11 @@ #~ "bola: {0}" -#, java-format #~ msgid "" #~ "Failed to close changeset {0}, will be closed by server after timeout. " #~ "Exception was: {1}" #~ msgstr "" -#~ "Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového limitu " -#~ "servera. Výnimka bola: {1}" - -#, java-format +#~ "Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového " +#~ "limitu servera. Výnimka bola: {1}" + #~ msgid "" #~ "There are unsaved changes in {0} layer. Discard the changes and continue?" @@ -29084,17 +29124,17 @@ #~ "Vo vrstve sa nachádza neuložená {0} zmena. Nepoužiť zmenu a pokračovať?" #~ msgstr[2] "" -#~ "Vo vrstve sa nachádzajú neuložených {0} zmien. Nepoužiť zmeny a pokračovať?" - -#, java-format +#~ "Vo vrstve sa nachádzajú neuložených {0} zmien. Nepoužiť zmeny a " +#~ "pokračovať?" + #~ msgid "" #~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " #~ "relation?" #~ msgstr "" -#~ "Výber \"{0}\" je použitý reláciou \"{1}\".
Zmazať z relácie?" - -#, java-format +#~ "Výber \"{0}\" je použitý reláciou \"{1}\".
Zmazať z relácie?" + #~ msgid "" -#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.
Delete " -#~ "from relation?" +#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." +#~ "
Delete from relation?" #~ msgstr "" #~ "Výber \"{0}\" je použitý reláciou \"{1}\" s úlohou {2}.
Zmazať z " @@ -29108,11 +29148,10 @@ #~ msgid "" -#~ "Select to upload the data using a new changeset and to leave the changeset " -#~ "open after the upload" +#~ "Select to upload the data using a new changeset and to leave the " +#~ "changeset open after the upload" #~ msgstr "" #~ "Vybrať pre nahratie používaných dát nový súbor zmien a nechať súbor zmien " #~ "otvorený aj po nahratí" -#, java-format #~ msgid "" #~ "Select to upload to the existing changeset {0} and to leave the changeset " @@ -29122,9 +29161,7 @@ #~ "otvorený pre ďalšie nahratia" -#, java-format #~ msgid "Use the existing changeset {0} and close it after upload" #~ msgstr "Použite existujúci súbor zmien {0} a zavrite ho po nahratí" -#, java-format #~ msgid "" #~ "Select to upload to the existing changeset {0} and to close the changeset " @@ -29134,18 +29171,16 @@ #~ "tomto nahratí" -#, java-format #~ msgid "Use the existing changeset {0} and leave it open" #~ msgstr "Použite existujúci súbor zmien {0} a nechajte ho otvorený" -#, java-format #~ msgid "" #~ "Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -#~ "changeset will automatically be closed by the server after a timeout." +#~ "changeset will automatically be closed by the server after a timeout." #~ msgstr "" -#~ "Neúspešné zatváranie súboru zmien ''{0}'' na OSM servery " -#~ "''{1}''.
The súbor zmien bude automaticky zavretý na servery po vypršaní " +#~ "Neúspešné zatváranie súboru zmien ''{0}'' na OSM servery ''{1}''." +#~ "
The súbor zmien bude automaticky zavretý na servery po vypršaní " #~ "časového limitu." -#, java-format #~ msgid "Changeset {0} is unchanged. Skipping update." #~ msgstr "Súbor zmien {0} je nezmenený. Ukončujem aktualizáciu." @@ -29154,11 +29189,10 @@ #~ msgstr "Teraz nie je otvorený súbor zmien. Otváram nový súbor zmien..." -#, java-format #~ msgid "Reusing existing changeset {0}" #~ msgstr "Znovu použitý existujúci súbor zmien {0}" #~ msgid "" -#~ "Warning: could not reuse an existing changeset as requested. Opening a new " -#~ "one." +#~ "Warning: could not reuse an existing changeset as requested. Opening a " +#~ "new one." #~ msgstr "" #~ "Varovanie: nemôžem znovu použiť nejaký existujúci súbor zmien pokiaľ bol " @@ -29166,9 +29200,9 @@ #~ msgid "" -#~ "Failed to update changeset. Either there is no current changeset or the id " -#~ "of the current changeset is 0" +#~ "Failed to update changeset. Either there is no current changeset or the " +#~ "id of the current changeset is 0" #~ msgstr "" -#~ "Neúspešná aktualizácia súboru zmien. Nachádza sa tu neaktuálny súbor zmien, " -#~ "alebo id aktuálneho súboru zmien je 0" +#~ "Neúspešná aktualizácia súboru zmien. Nachádza sa tu neaktuálny súbor " +#~ "zmien, alebo id aktuálneho súboru zmien je 0" #~ msgid "not yet decided" @@ -29178,9 +29212,7 @@ #~ msgstr "Nastavenie(Set) " -#, java-format #~ msgid "paramete''{0}'' must not be null" #~ msgstr "parameter''{0}'' nesmie byť nula" -#, java-format #~ msgid "unsupported value ''{0}'' or parameter ''{1}''" #~ msgstr "nepodporovaná hodnota ''{0}'' alebo parameter ''{1}''" @@ -29192,64 +29224,52 @@ #~ msgstr "Nahradiť cestu s odkazom na jej člena so spojením cesty" -#, java-format #~ msgid "Missing mandatory attribute ''{0}''" #~ msgstr "Chýba povinný atribút ''{0}''" -#, java-format #~ msgid "" -#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 0, API " -#~ "version is ''0.5''. Got {1}" +#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 0, " +#~ "API version is ''0.5''. Got {1}" #~ msgstr "" -#~ "VERZIA: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, API " -#~ "verziu je ''0.5''. Got {1}" - -#, java-format +#~ "VERZIA: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, " +#~ "API verziu je ''0.5''. Got {1}" + #~ msgid "" -#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 1, API " -#~ "version is ''0.5''. Got {1}" +#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 1, " +#~ "API version is ''0.5''. Got {1}" #~ msgstr "" #~ "VAROVANIE: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 1, " #~ "API verzia je ''0.5''. Got {1}" -#, java-format #~ msgid "Preset group ''{0}'' of group ''{1}''" #~ msgstr "Prednastavená skupina ''{0}'' zo skupiny ''{1}''" -#, java-format #~ msgid "Processing {0}" #~ msgstr "Spracovávanie {0}" -#, java-format #~ msgid "Relation: from {0} to {1} via {2}" #~ msgstr "Relácia: z {0} do {1} sprostredkujúca(via) {2}" -#, java-format #~ msgid "{0} extrem nodes." #~ msgstr "{0} hraničné(extrem) body." -#, java-format #~ msgid "Via node {0}, {1}" #~ msgstr "Sprostredkujúce(Via) body {0}, {1}" -#, java-format #~ msgid "{0} via nodes." #~ msgstr "{0} Sprostredkujúce(via) body." -#, java-format #~ msgid "MIddle way: {0}" #~ msgstr "Stred(MIddle) cesty: {0}" -#, java-format #~ msgid "Help page missing. Create it in English." #~ msgstr "" #~ "Chýbajúca stránka s pomocou. Vytvorte to v English." -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" -#~ "Chýbajúca stránka s pomocou. Vytvorte to v English or " -#~ "váš jazyk." +#~ "Chýbajúca stránka s pomocou. Vytvorte to v English " +#~ "or váš jazyk." #~ msgid "Didn't find an primitive with id {0} in this dataset" @@ -29261,11 +29281,10 @@ #~ msgid "" -#~ "Helppage missing. Create it in English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" -#~ "Stránka s nápovedou chýba. Vytvorte to v English alebo " -#~ "váš jazyk." - -#, java-format +#~ "Stránka s nápovedou chýba. Vytvorte to v English " +#~ "alebo váš jazyk." + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "neočakávaná hodnota. Dostal {0}" @@ -29283,5 +29302,4 @@ #~ msgstr "nenájdená staršia verzia. História je prázdna." -#, java-format #~ msgid "Index out of bounds. Got {0}." #~ msgstr "index je mimo hranice Dostať {0}" @@ -29290,5 +29308,4 @@ #~ msgstr "Zobraziť priebeh z vybraných pôvodných" -#, java-format #~ msgid "" #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." @@ -29296,20 +29313,18 @@ #~ "nedovolená hodnota pre povinný atribút ''{0}'' typu int, dostáva ''{1}''" -#, java-format #~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''." +#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " +#~ "''{1}''." #~ msgstr "" #~ "nedovolená hodnota pre povinný atribút ''{0}'' typu int (>=0), dostáva " #~ "''{1}''" -#, java-format #~ msgid "" -#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back to " -#~ "default geometry. Details: {1}" +#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back " +#~ "to default geometry. Details: {1}" #~ msgstr "" #~ "Varovanie: neúspešná obnova geometrie okna z kľúča ''{0}''. Ustupujem pre " #~ "východziu geometriu. Detaily: {1}" -#, java-format #~ msgid "" #~ "The OSM server ''{0}'' doesn't know about an object
you tried to read, " Index: /applications/editors/josm/i18n/po/sl.po =================================================================== --- /applications/editors/josm/i18n/po/sl.po (revision 18974) +++ /applications/editors/josm/i18n/po/sl.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:34+0000\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-11-29 22:20+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Slovenian \n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || " -"n%100==4 ? 3 : 0);\n" -"X-Launchpad-Export-Date: 2009-11-29 21:05+0000\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" +"X-Launchpad-Export-Date: 2009-12-06 13:17+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 "Napaka" @@ -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 "Vstavki" @@ -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 "Z. širina" #: ../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 "Z. dolžina" @@ -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}" @@ -684,10 +679,10 @@ msgstr "Poti se ne da združiti (Vozlišča niso povezana v premem zaporedju)" -#: ../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 "Združi {0} poti" -#: ../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 "" @@ -706,19 +701,19 @@ msgstr "Izberite predmete, ki jih želite kopirati." +#: ../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 "Ustvari krog" -#: ../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 "Skozi izbrana tri vozlišča ustvari krog" -#: ../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 " @@ -729,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 @@ -803,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" @@ -825,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 @@ -853,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 "Podvoji" @@ -908,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 @@ -917,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 @@ -928,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 @@ -948,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 @@ -972,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 @@ -1018,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 "Razreši neskladja" + +#: ../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 @@ -1035,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" @@ -1043,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 "Združi vozlišča" -#: ../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 "Združi vozlišča v najstarejšega" -#: ../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 "Izberite vsaj dve vozlišči za združitev" -#: ../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 "" @@ -1070,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" @@ -1439,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 "" "Prikaži poročilo o stanju s podatki, ki so lahko koristni pri prijavi napak" @@ -1459,9 +1593,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 "Zapri" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Poenostavi pot" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Izbriši nepotrebna vozlišča iz poti." + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti." + +#: ../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 "Ali ste prepričani?" + +#: ../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 @@ -1592,6 +1758,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 "* Eno vozlišče, ki je del več poti in eno izmed teh poti, ali" @@ -1667,54 +1832,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 "Posodobi izbor" +#: ../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 "Izbor je prazen" -#: ../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 "" @@ -1723,35 +1888,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 "Ni sprememb za pošiljanje." -#: ../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 "Ni česa poslati. Najprej pridobite kakšne podatke." -#: ../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 "" @@ -1759,28 +1924,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 "" @@ -1790,22 +1953,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 "" @@ -1816,15 +1979,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 "" @@ -1836,6 +1999,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 "" @@ -1844,38 +2007,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 "" @@ -2039,6 +2201,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 "" @@ -2105,38 +2267,38 @@ msgstr "izbrano" -#: ../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 "Ni mogoče dodati vozlišča izven tega sveta." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Dodaj vozlišče" -#: ../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 "Dodaj vozlišče v pot" -#: ../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 "Poveži obstoječo pot z vozliščem" -#: ../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 "Dodaj novo vozlišče v pot" -#: ../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 "Dodaj in poveži vozlišče v pot" -#: ../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 "Ustvari novo vozlišče." -#: ../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 "Izberi vozlišče pod kazalcem miške." -#: ../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." @@ -2147,14 +2309,14 @@ msgstr[3] "Vstavi novo vozlišče v {0} poti." -#: ../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 "Začni novo pot od zadnjega vozlišča" -#: ../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 "Nadaljuj pot od zadnjega vozlišča." -#: ../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 "Zaključi risanje." @@ -2189,6 +2351,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 "" @@ -2285,5 +2447,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." @@ -2366,12 +2528,16 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +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-" @@ -2379,43 +2545,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 @@ -2425,55 +2591,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 "Iskanje" -#: ../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 "Začni iskanje" -#: ../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 "" -#: ../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 "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar" -#: ../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 "Z iskanjem ''{0}'' ni bilo iz izbora odstranjeno ničesar" -#: ../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 "Najdeno {0} zadetkov" -#: ../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 "" @@ -2483,40 +2649,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 "" @@ -2525,9 +2691,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 "" @@ -2536,5 +2702,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." @@ -2585,6 +2751,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 "" @@ -2592,5 +2757,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 "" @@ -2728,5 +2893,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 "" @@ -2745,5 +2910,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 "" @@ -2762,19 +2928,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" @@ -2783,5 +2949,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" @@ -2790,5 +2956,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" @@ -2797,5 +2963,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" @@ -2806,13 +2972,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 "" @@ -2830,15 +2996,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 "" @@ -2847,5 +3013,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}" @@ -2855,9 +3021,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 "" @@ -2937,5 +3098,5 @@ msgstr "Uveljavim?" -#: ../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 " @@ -3078,6 +3239,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 "" @@ -3160,5 +3321,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3167,5 +3328,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3173,25 +3334,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 "J" #. 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 "S" #. 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 "Z" #. 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 "V" #: ../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 @@ -3214,25 +3375,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}" @@ -3240,6 +3402,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 "" @@ -3302,24 +3464,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 " @@ -3327,5 +3489,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 "" @@ -3357,6 +3519,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}." @@ -3377,5 +3539,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 @@ -3387,6 +3548,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 "" @@ -3397,135 +3557,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 "" +#: ../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 "" + +#: ../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 "" + +#: ../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:557 +msgid "More than one \"to\" way found." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:922 -#, java-format -msgid "Deleted member ''{0}'' in relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:930 -#, java-format -msgid "Way ''{0}'' with less than two points." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579 -msgid "More than one \"from\" way found." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 -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: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 "Neznana vloga ''{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 "" -#: ../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:832 +#, java-format +msgid "Intersection between ways ''{0}'' and ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844 +#, java-format +msgid "Inner way ''{0}'' is outside." +msgstr "" + +#: ../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:891 #, java-format -msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:903 -#, java-format -msgid "Inner way ''{0}'' is outside." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938 -#, java-format -msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950 -#, 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 "besedilo" -#: ../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 "Napaka: {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}" @@ -3537,5 +3697,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 @@ -3558,5 +3718,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 @@ -3578,5 +3738,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 "ozadje" @@ -3694,6 +3854,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 "" @@ -3708,5 +3867,5 @@ msgstr "Ne prikaži več" -#: ../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 @@ -3714,32 +3873,32 @@ msgstr "" -#: ../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 "nepopoln" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "cesta" -#: ../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 "železnica" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "vodotok" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "raba tal" -#: ../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" @@ -3750,5 +3909,5 @@ msgstr[3] "{0} točke" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -3991,12 +4150,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Datoteka" -#: ../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 @@ -4010,19 +4169,19 @@ msgstr "Uredi" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Pogled" -#: ../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 "Orodja" -#: ../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 "Prednastavitve" -#: ../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 @@ -4033,5 +4192,5 @@ msgstr "Meni: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Zvok" @@ -4075,29 +4234,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 "Geografska dolžina pod kazalcem miške." -#: ../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 "Ime predmeta pod kazalcem miške." -#: ../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 "Geografska širina pod kazalcem miške." -#: ../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 " @@ -4105,9 +4264,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(ni predmeta)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "" @@ -4213,5 +4372,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" @@ -4220,5 +4379,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" @@ -4227,5 +4386,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" @@ -4244,5 +4403,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 @@ -4259,5 +4418,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" @@ -4329,22 +4488,22 @@ msgstr "Odpravljanje sporov" -#: ../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." @@ -4423,6 +4582,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 "" @@ -4491,6 +4649,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" @@ -4498,6 +4656,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" @@ -4554,6 +4712,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 "" @@ -4586,7 +4744,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 "" @@ -4732,5 +4890,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 "" @@ -4865,5 +5023,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 "" @@ -4963,7 +5121,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" @@ -4973,6 +5131,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" @@ -5006,7 +5164,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 "" @@ -5095,5 +5251,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 @@ -5158,10 +5314,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 "" @@ -5236,18 +5391,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 "Zgodovina" -#: ../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 "Prikaži zgodovino izbranih predmetov" -#: ../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 @@ -5257,13 +5412,13 @@ msgstr "Ponovno naloži" -#: ../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 "" @@ -5460,5 +5615,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 "" @@ -5501,30 +5656,30 @@ msgstr "Povečava na ves izbor" -#: ../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 "" -#: ../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 "Izbor" -#: ../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 "" -#: ../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 "" @@ -5584,37 +5739,37 @@ msgstr "Št. predmetov" -#: ../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 "" @@ -5623,63 +5778,93 @@ 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] "Sprejmi vse nepopolne poti in vozlišča v relaciji" +msgstr[1] "Sprejmi vse nepopolne poti in vozlišča v relaciji" +msgstr[2] "Sprejmi vse nepopolne poti in vozlišča v relaciji" +msgstr[3] "Sprejmi vse nepopolne poti in vozlišča v relaciji" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Mesto vira sprejema" + +#: ../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 "Uporabi prednastavitev" + +#: ../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 "Odpri urejevalnik za izbrano relacijo" + +#: ../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 "" @@ -5689,15 +5874,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 " @@ -5705,5 +5890,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 " @@ -5711,20 +5896,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 "" @@ -5733,66 +5918,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 "Šport" + +#: ../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 "Pomakni izbranega člana vrstico višje." #. 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 "Pomakni izbranega člana vrstico nižje." #. 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 " @@ -5801,53 +5990,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 "Sprejmi vse nepopolne poti in vozlišča v relaciji" -#: ../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 "" @@ -5857,41 +6052,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 "" @@ -5931,19 +6119,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}''" @@ -5955,6 +6143,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 "" @@ -6134,7 +6321,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 "" @@ -6907,5 +7093,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 @@ -7142,6 +7328,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 "" @@ -7151,6 +7337,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 "" @@ -7413,13 +7599,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}" @@ -7520,6 +7706,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 "" @@ -7604,6 +7789,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] "" @@ -7617,6 +7802,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 " @@ -7671,5 +7856,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 " @@ -7677,5 +7862,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 "" @@ -7748,40 +7933,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 "Novi predmeti:" -#: ../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 "Spremenjeni predmeti:" -#: ../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 "Izbrisani predmeti:" -#: ../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:" @@ -7790,5 +7975,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:" @@ -7797,5 +7982,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:" @@ -7804,68 +7989,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 "Prosim, vnesite želene koordinate." + +#: ../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 "Vpišite kratek opis sprememb, ki jih pošiljate:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../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}" @@ -7873,16 +8057,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}." @@ -7890,6 +8074,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 "" @@ -7898,5 +8082,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 "" @@ -7926,113 +8110,57 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Točka {0} x {1} nima časovne oznake" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 -#, java-format -msgid "Cannot read time \"{0}\" from point {1} x {2}" -msgstr "Ni mogoče razbrati časa \"{0}\" točke {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 "Berem {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Ni moč najti slik z berljivo časovno oznako." - -#: ../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 "Slike z geografskim položajem" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "Začetek GPS sledi: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "Konec GPS sledi: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "trenutna razlika: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "razlika časovnih pasov: " - -#: ../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] "slik" -msgstr[1] "slika" -msgstr[2] "sliki" -msgstr[3] "slike" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} znotraj sledi." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Uskladi uro" - -#: ../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 "Slike JPEG (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "Datuma v datoteki \"{0}\" ni bilo možno razbrati." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "V datoteki \"{0}\" manjka EXIF čas." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Slika" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Vnesite prikazan čas (mm/dd/yyyy HH:MM:SS)" - -#: ../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 "Uskladite čas z GPS napravo" - -#: ../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 "Vpisanega časa ni bilo mogoče razpoznati." - -#: ../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 +#, java-format +msgid "({0} request)" +msgid_plural "({0} requests)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: ../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 "Prosim, vpišite iskani niz" + +#: ../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 @@ -8040,30 +8168,30 @@ msgstr "točka 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 "Riši povezave med točkami na tej plasti." -#: ../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 "Ne riši povezav med točkami na tej plasti." -#: ../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 @@ -8071,5 +8199,5 @@ msgstr "Prilagodi barvo" -#: ../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 @@ -8078,5 +8206,5 @@ msgstr "Privzeto" -#: ../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 @@ -8085,58 +8213,63 @@ msgstr "Izberite barvo" -#: ../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 "Uvozi zvok" -#: ../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 "Zvočne datoteke (*.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 "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301 msgid "Import images" msgstr "Uvozi slike" -#: ../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 "Slike JPEG (*.jpg)" + +#: ../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 "" -#: ../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 @@ -8144,5 +8277,5 @@ msgstr "Opis: {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" @@ -8152,5 +8285,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 @@ -8158,22 +8291,17 @@ msgstr "Opis" -#: ../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, " @@ -8182,5 +8310,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" @@ -8189,22 +8317,22 @@ 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 "Pretvori v podatkovno plast" -#: ../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 +8342,29 @@ msgstr "" -#: ../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 "Sprejmi iz OSM vzdolž te sledi" -#: ../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 "Sprejmi vse znotraj:" -#: ../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 "" -#: ../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 "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8247,9 +8375,9 @@ "nadaljevati?" -#: ../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 " @@ -8257,5 +8385,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 " @@ -8263,23 +8391,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 "" -#: ../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 "izven sprejetega področja" -#: ../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." @@ -8288,5 +8416,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 "" @@ -8300,5 +8428,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 "" @@ -8311,11 +8439,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" @@ -8324,32 +8452,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} je sestavljen iz:" -#: ../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 "Pretvori v plast GPX" -#: ../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 "" @@ -8357,6 +8485,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 +8529,345 @@ msgstr[3] "{0} točke" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "Datoteke GPX (*.gpx *.gpx.gz)" + +#: ../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 "Napaka pri razčlenjevanju {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Ni bilo možno prebrati \"{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 "Vse slike" + +#: ../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 "Berem {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 "Slike z geografskim položajem" + +#: ../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] "slik" +msgstr[1] "slika" +msgstr[2] "sliki" +msgstr[3] "slike" + +#: ../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 "Ni slike" + +#: ../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 "Napaka v datoteki {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Prikaži slike z geografskim položajem" + +#: ../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 "Odstrani fotografijo iz plasti" + +#: ../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" @@ -8696,5 +9165,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 @@ -8888,6 +9357,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 "" @@ -8946,6 +9414,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 "" @@ -9013,19 +9480,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 "Videz in občutek" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Jezik" + +#: ../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 "Privzeto (samodejna izbira)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Jezik" - -#: ../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 @@ -9284,6 +9751,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 "" @@ -9346,6 +9813,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 "" @@ -9358,9 +9825,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 "" @@ -9384,6 +9850,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 "" @@ -9476,5 +9942,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 "" @@ -9563,5 +10029,5 @@ msgstr "Sprejem točk od {0} do {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 @@ -9569,5 +10035,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9689,14 +10155,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 @@ -9724,24 +10189,33 @@ 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] "Sprejem točk od {0} do {1}..." +msgstr[1] "Sprejem točk od {0} do {1}..." +msgstr[2] "Sprejem točk od {0} do {1}..." +msgstr[3] "Sprejem točk od {0} do {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9783,27 +10257,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 "" @@ -9811,66 +10285,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 "Pripravljanje..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Pošiljanje ..." -#: ../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}." @@ -9905,5 +10379,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}''." @@ -9930,5 +10404,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}." @@ -9936,5 +10410,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}" @@ -9947,5 +10421,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}''." @@ -9987,6 +10461,5 @@ msgid "" "Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje." +msgstr "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje." #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 @@ -10004,7 +10477,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 "" @@ -10032,6 +10505,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 "" @@ -10097,46 +10570,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 "" @@ -10144,19 +10616,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 "predmet z id=0 ni dovoljen" -#: ../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 "" @@ -10166,8 +10638,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 "" @@ -10177,25 +10649,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 "" @@ -10203,5 +10675,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10210,5 +10682,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10216,5 +10688,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10223,13 +10695,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 "Priprava podatkov OSM..." -#: ../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 "" @@ -10282,4 +10754,10 @@ msgid "Contacting Server..." msgstr "Vzpostavljanje povezave s strežnikom..." + +#: ../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 @@ -10319,42 +10797,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 "" @@ -10396,17 +10875,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 "Izbriši {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Napaka pri brisanju datoteke vstavka: {0}" + +#: ../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}." @@ -10418,19 +10907,18 @@ msgstr "V vstavku {0} je prišlo do napake" -#: ../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" @@ -10439,50 +10927,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 "Zadnja posodobitev vstavkov pred več kot {0} dnevi." -#: ../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 "Vstavka {0} ni bilo mogoče najti." -#: ../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 "Vstavka {0} ni bilo mogoče naložiti. Ga izbrišem iz nastavitev?" -#: ../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 "Onemogoči vstavek" -#: ../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 " @@ -10492,9 +10980,9 @@ "prepisati obstoječe datoteke." -#: ../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 "" @@ -10503,10 +10991,10 @@ "Prišlo je do nepričakovane napake, ki verjetno izvira iz vstavka ''{0}''." -#: ../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 "Glede na podatke znotraj vstavka je avtor {0}." -#: ../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." @@ -10514,9 +11002,9 @@ "Preden prijavite napako poskusite posodobiti vstavek na najnovejšo različico." -#: ../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 "Naj vstavek onemogočim?" -#: ../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 " @@ -10526,13 +11014,13 @@ "njegovo odstranitev iz spomina." -#: ../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" @@ -10653,6 +11141,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 "" @@ -10690,6 +11178,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 "" @@ -10751,7 +11239,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 "" @@ -10763,7 +11250,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 "" @@ -10795,6 +11282,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 "" @@ -11045,5 +11532,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" @@ -11058,12 +11545,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 @@ -11071,441 +11556,141 @@ 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 +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 +msgid "Actual" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "slik" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Izposojevalnica" + +#: ../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 +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 "AgPifoJ - slike z geografskim položajem" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "Prikaži slike z geografskim položajem" - -#: ../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 "Odstrani fotografijo iz plasti" - -#: ../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 "Naloži slike v novo plast." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "Datoteke GPX (*.gpx *.gpx.gz)" - -#: ../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 "Napaka pri razčlenjevanju {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Ni bilo možno prebrati \"{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 "Vse slike" - -#: ../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 "Ni slike" - -#: ../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 "Napaka v datoteki {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11649,11 +11834,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 "" @@ -11959,12 +12143,4 @@ msgid "Export as PNG format (only raster images)" 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 @@ -12077,14 +12253,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 " @@ -12392,4 +12568,8 @@ msgstr "" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Naloži slike v novo plast." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -12433,18 +12613,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" @@ -12493,7 +12673,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12503,5 +12683,5 @@ #. 50000 #. -#. +#. #. #. @@ -12511,5 +12691,5 @@ #. 50000 #. -#. +#. #. #. @@ -12518,5 +12698,5 @@ #. 50000 #. -#. +#. #. #. @@ -12526,5 +12706,5 @@ #. 50000 #. -#. +#. #. #. @@ -12602,6 +12782,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 "" @@ -12620,7 +12799,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 "" @@ -12683,20 +12861,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 "" @@ -12914,6 +13091,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 "" @@ -12994,9 +13170,10 @@ msgstr "Neznana končnica datoteke: {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 " @@ -13004,9 +13181,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 "" @@ -13379,17 +13552,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 "" @@ -13434,160 +13607,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 "Razreši neskladja" - -#: ../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 "Poenostavi pot" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Izbriši nepotrebna vozlišča iz poti." - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti." - -#: ../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 "Ali ste prepričani?" - #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:93 @@ -13682,5 +13699,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}" @@ -13733,34 +13750,34 @@ msgstr "Naslednjič prezri izbrane napake." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Celotna skupina" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Posamezen element" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Nič" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Prezri celotno skupino ali posamezne elemente?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 msgid "Ignoring elements" msgstr "Preziranje elementov" -#: ../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 "" @@ -13809,18 +13826,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 "Podvojena vozlišča" -#: ../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 "" @@ -14049,7 +14066,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 "" @@ -14192,5 +14208,5 @@ #. 50000 #. -#. +#. #. #. @@ -14198,5 +14214,5 @@ #. #. -#. +#. #. #. @@ -14206,5 +14222,5 @@ #. 50000 #. -#. +#. #. #. @@ -14213,5 +14229,5 @@ #. 50000 #. -#. +#. #. #. @@ -14220,5 +14236,5 @@ #. 50000 #. -#. +#. #. #. @@ -14227,5 +14243,5 @@ #. 50000 #. -#. +#. #. #. @@ -14234,5 +14250,5 @@ #. 50000 #. -#. +#. #. #. @@ -14241,9 +14257,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14288,5 +14304,5 @@ #. 50000 #. -#. +#. #. #. @@ -14419,14 +14435,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 " @@ -14435,14 +14451,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 "" @@ -14451,5 +14467,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 "" @@ -14461,13 +14477,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." @@ -14621,50 +14637,50 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "Naloži vidne ploščice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "Spremeni ločljivost" -#: ../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 "Shrani plast WMS v datoteko" -#: ../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 "Naloži plast WMS iz datoteke" -#: ../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 "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}" -#: ../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 "" @@ -14740,5 +14756,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 "" @@ -14776,21 +14792,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 " @@ -14802,21 +14813,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 " @@ -14825,10 +14836,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 " @@ -14837,21 +14848,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 " @@ -14861,16 +14871,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 " @@ -14880,10 +14890,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 " @@ -14892,5 +14902,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 " @@ -14900,27 +14910,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 " @@ -14929,15 +14939,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 +msgid "Let other applications send commands to JOSM." +msgstr "" + +#. Plugin routes #: build/trans_plugins.java:55 -msgid "Let other applications send commands to JOSM." -msgstr "" - -#. Plugin routes -#: build/trans_plugins.java:57 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -14946,10 +14956,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 " @@ -14958,15 +14968,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 " @@ -14976,17 +14986,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 " @@ -14995,5 +14998,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15002,10 +15005,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, ...)." @@ -16058,8 +16061,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16256,5 +16259,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16264,5 +16267,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16281,5 +16284,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16289,5 +16292,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16306,5 +16309,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16314,5 +16317,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16331,5 +16334,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16339,5 +16342,5 @@ #. 300000 #. -#. +#. #. #. @@ -16352,5 +16355,5 @@ #. 300000 #. -#. +#. #. #. @@ -16368,5 +16371,5 @@ #. 50000 #. -#. +#. #. #. @@ -16384,5 +16387,5 @@ #. 40000 #. -#. +#. #. #. @@ -16391,5 +16394,5 @@ #. 40000 #. -#. +#. #. #. @@ -16399,5 +16402,5 @@ #. 50000 #. -#. +#. #. #. @@ -16417,5 +16420,5 @@ #. 50000 #. -#. +#. #. #. @@ -16424,5 +16427,5 @@ #. 50000 #. -#. +#. #. #. @@ -16432,5 +16435,5 @@ #. 50000 #. -#. +#. #. #. @@ -16480,7 +16483,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17179,5 +17182,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17216,5 +17219,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17310,5 +17313,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17465,5 +17468,5 @@ #. 50000 #. -#. +#. #. #. @@ -18850,5 +18853,5 @@ #. 30000 #. -#. +#. #. #. @@ -18858,5 +18861,5 @@ #. 40000 #. -#. +#. #. #. @@ -18866,5 +18869,5 @@ #. 20000 #. -#. +#. #. #. @@ -18874,5 +18877,5 @@ #. 40000 #. -#. +#. #. #. @@ -19230,7 +19233,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19240,5 +19243,5 @@ #. 50000 #. -#. +#. #. #. @@ -19248,5 +19251,5 @@ #. 50000 #. -#. +#. #. #. @@ -19256,5 +19259,5 @@ #. 50000 #. -#. +#. #. #. @@ -19264,5 +19267,5 @@ #. 50000 #. -#. +#. #. #. @@ -19272,5 +19275,5 @@ #. 50000 #. -#. +#. #. #. @@ -19280,5 +19283,5 @@ #. 50000 #. -#. +#. #. #. @@ -19288,5 +19291,5 @@ #. 50000 #. -#. +#. #. #. @@ -19296,5 +19299,5 @@ #. 50000 #. -#. +#. #. #. @@ -19304,5 +19307,5 @@ #. 50000 #. -#. +#. #. #. @@ -19312,5 +19315,5 @@ #. 50000 #. -#. +#. #. #. @@ -19320,5 +19323,5 @@ #. 50000 #. -#. +#. #. #. @@ -19328,5 +19331,5 @@ #. 50000 #. -#. +#. #. #. @@ -19336,5 +19339,5 @@ #. 50000 #. -#. +#. #. #. @@ -19344,5 +19347,5 @@ #. 50000 #. -#. +#. #. #. @@ -19352,5 +19355,5 @@ #. 50000 #. -#. +#. #. #. @@ -19360,5 +19363,5 @@ #. 50000 #. -#. +#. #. #. @@ -19368,5 +19371,5 @@ #. 50000 #. -#. +#. #. #. @@ -19376,5 +19379,5 @@ #. 50000 #. -#. +#. #. #. @@ -19384,5 +19387,5 @@ #. 50000 #. -#. +#. #. #. @@ -19392,5 +19395,5 @@ #. 50000 #. -#. +#. #. #. @@ -19400,5 +19403,5 @@ #. 50000 #. -#. +#. #. #. @@ -19408,5 +19411,5 @@ #. 50000 #. -#. +#. #. #. @@ -19416,5 +19419,5 @@ #. 50000 #. -#. +#. #. #. @@ -19424,5 +19427,5 @@ #. 50000 #. -#. +#. #. #. @@ -19432,5 +19435,5 @@ #. 50000 #. -#. +#. #. #. @@ -19440,5 +19443,5 @@ #. 50000 #. -#. +#. #. #. @@ -19448,5 +19451,5 @@ #. 50000 #. -#. +#. #. #. @@ -19456,5 +19459,5 @@ #. 50000 #. -#. +#. #. #. @@ -19464,5 +19467,5 @@ #. 50000 #. -#. +#. #. #. @@ -19472,5 +19475,5 @@ #. 50000 #. -#. +#. #. #. @@ -19480,5 +19483,5 @@ #. 50000 #. -#. +#. #. #. @@ -19488,5 +19491,5 @@ #. 50000 #. -#. +#. #. #. @@ -19496,5 +19499,5 @@ #. 50000 #. -#. +#. #. #. @@ -19504,5 +19507,5 @@ #. 50000 #. -#. +#. #. #. @@ -19512,5 +19515,5 @@ #. 50000 #. -#. +#. #. #. @@ -19520,5 +19523,5 @@ #. 50000 #. -#. +#. #. #. @@ -19528,5 +19531,5 @@ #. 50000 #. -#. +#. #. #. @@ -19536,5 +19539,5 @@ #. 50000 #. -#. +#. #. #. @@ -19544,5 +19547,5 @@ #. 50000 #. -#. +#. #. #. @@ -19552,5 +19555,5 @@ #. 50000 #. -#. +#. #. #. @@ -19560,5 +19563,5 @@ #. 50000 #. -#. +#. #. #. @@ -19568,5 +19571,5 @@ #. 50000 #. -#. +#. #. #. @@ -19576,5 +19579,5 @@ #. 50000 #. -#. +#. #. #. @@ -19584,5 +19587,5 @@ #. 50000 #. -#. +#. #. #. @@ -19592,5 +19595,5 @@ #. 50000 #. -#. +#. #. #. @@ -19600,5 +19603,5 @@ #. 50000 #. -#. +#. #. #. @@ -21292,7 +21295,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21302,5 +21305,5 @@ #. 50000 #. -#. +#. #. #. @@ -21310,5 +21313,5 @@ #. 50000 #. -#. +#. #. #. @@ -21318,5 +21321,5 @@ #. 50000 #. -#. +#. #. #. @@ -21326,5 +21329,5 @@ #. 50000 #. -#. +#. #. #. @@ -21334,5 +21337,5 @@ #. 50000 #. -#. +#. #. #. @@ -21342,5 +21345,5 @@ #. 50000 #. -#. +#. #. #. @@ -21350,5 +21353,5 @@ #. 50000 #. -#. +#. #. #. @@ -22679,5 +22682,5 @@ #. 40000 #. -#. +#. #. #. @@ -22693,5 +22696,5 @@ #. 30000 #. -#. +#. #. #. @@ -22702,7 +22705,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22712,5 +22715,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22720,13 +22731,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22736,5 +22739,5 @@ #. 50000 #. -#. +#. #. #. @@ -22767,5 +22770,5 @@ #. 50000 #. -#. +#. #. #. @@ -22781,5 +22784,5 @@ #. 50000 #. -#. +#. #. #. @@ -22789,5 +22792,5 @@ #. 10000 #. -#. +#. #. #. @@ -22797,5 +22800,5 @@ #. 10000 #. -#. +#. #. #. @@ -22806,5 +22809,5 @@ #. 10000 #. -#. +#. #. #. @@ -22833,5 +22836,5 @@ #. 50000 #. -#. +#. #. #. @@ -22946,9 +22949,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 @@ -22956,5 +22959,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, @@ -22964,8 +22967,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 @@ -22979,5 +22982,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -22985,5 +22988,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23032,6 +23035,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23111,5 +23114,5 @@ #. 40000 #. -#. +#. #. #. @@ -23119,5 +23122,5 @@ #. 10000 #. -#. +#. #. #. @@ -23126,5 +23129,5 @@ #. 50000 #. -#. +#. #. #. @@ -23134,5 +23137,5 @@ #. 50000 #. -#. +#. #. #. @@ -23141,5 +23144,5 @@ #. 50000 #. -#. +#. #. #. @@ -23148,5 +23151,5 @@ #. 50000 #. -#. +#. #. #. @@ -23155,5 +23158,5 @@ #. 50000 #. -#. +#. #. #. @@ -23162,5 +23165,5 @@ #. 50000 #. -#. +#. #. #. @@ -23169,5 +23172,5 @@ #. 40000 #. -#. +#. #. #. @@ -23176,5 +23179,5 @@ #. 50000 #. -#. +#. #. #. @@ -23183,5 +23186,5 @@ #. 50000 #. -#. +#. #. #. @@ -23190,5 +23193,5 @@ #. 50000 #. -#. +#. #. #. @@ -23197,5 +23200,5 @@ #. 50000 #. -#. +#. #. #. @@ -23204,5 +23207,5 @@ #. 50000 #. -#. +#. #. #. @@ -23211,5 +23214,5 @@ #. 50000 #. -#. +#. #. #. @@ -23219,5 +23222,5 @@ #. 50000 #. -#. +#. #. #. @@ -23226,5 +23229,5 @@ #. 50000 #. -#. +#. #. #. @@ -23235,5 +23238,5 @@ #. 50000 #. -#. +#. #. #. @@ -23245,11 +23248,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23258,7 +23261,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23269,5 +23272,5 @@ #. 50000 #. -#. +#. #. #. @@ -23278,5 +23281,5 @@ #. 50000 #. -#. +#. #. #. @@ -23287,5 +23290,5 @@ #. 50000 #. -#. +#. #. #. @@ -23296,5 +23299,5 @@ #. 50000 #. -#. +#. #. #. @@ -23305,5 +23308,5 @@ #. 50000 #. -#. +#. #. #. @@ -23314,5 +23317,5 @@ #. 40000 #. -#. +#. #. #. @@ -23324,5 +23327,5 @@ #. 50000 #. -#. +#. #. #. @@ -23333,5 +23336,5 @@ #. 50000 #. -#. +#. #. #. @@ -23356,5 +23359,5 @@ #. 10000 #. -#. +#. #. #. @@ -23363,5 +23366,5 @@ #. 50000 #. -#. +#. #. #. @@ -23370,5 +23373,5 @@ #. 50000 #. -#. +#. #. #. @@ -23384,5 +23387,5 @@ #. 20000 #. -#. +#. #. #. @@ -23396,5 +23399,5 @@ #. 30000 #. -#. +#. #. #. @@ -23403,5 +23406,5 @@ #. 50000 #. -#. +#. #. #. @@ -23410,5 +23413,5 @@ #. 50000 #. -#. +#. #. #. @@ -23417,5 +23420,5 @@ #. 50000 #. -#. +#. #. #. @@ -23424,5 +23427,5 @@ #. 50000 #. -#. +#. #. #. @@ -23431,5 +23434,5 @@ #. 50000 #. -#. +#. #. #. @@ -23438,5 +23441,5 @@ #. 50000 #. -#. +#. #. #. @@ -23445,5 +23448,5 @@ #. 50000 #. -#. +#. #. #. @@ -23452,5 +23455,5 @@ #. 50000 #. -#. +#. #. #. @@ -23459,5 +23462,5 @@ #. 50000 #. -#. +#. #. #. @@ -23466,5 +23469,5 @@ #. 50000 #. -#. +#. #. #. @@ -23473,5 +23476,5 @@ #. 50000 #. -#. +#. #. #. @@ -23480,5 +23483,5 @@ #. 50000 #. -#. +#. #. #. @@ -23487,5 +23490,5 @@ #. 50000 #. -#. +#. #. #. @@ -23494,5 +23497,5 @@ #. 50000 #. -#. +#. #. #. @@ -23663,7 +23666,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23677,5 +23680,5 @@ #. 40000 #. -#. +#. #. #. @@ -23685,7 +23688,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23695,5 +23698,5 @@ #. 50000 #. -#. +#. #. #. @@ -23703,5 +23706,5 @@ #. 50000 #. -#. +#. #. #. @@ -23711,5 +23714,5 @@ #. 50000 #. -#. +#. #. #. @@ -23719,5 +23722,5 @@ #. 50000 #. -#. +#. #. #. @@ -23733,5 +23736,5 @@ #. 10000 #. -#. +#. #. #. @@ -23741,5 +23744,5 @@ #. 50000 #. -#. +#. #. #. @@ -23749,5 +23752,5 @@ #. 50000 #. -#. +#. #. #. @@ -23757,5 +23760,5 @@ #. 50000 #. -#. +#. #. #. @@ -23765,5 +23768,5 @@ #. 50000 #. -#. +#. #. #. @@ -23773,5 +23776,5 @@ #. 50000 #. -#. +#. #. #. @@ -23781,5 +23784,5 @@ #. 50000 #. -#. +#. #. #. @@ -23798,5 +23801,5 @@ #. 50000 #. -#. +#. #. #. @@ -23805,5 +23808,5 @@ #. 50000 #. -#. +#. #. #. @@ -23817,5 +23820,5 @@ #. 50000 #. -#. +#. #. #. @@ -23829,5 +23832,5 @@ #. 50000 #. -#. +#. #. #. @@ -23836,5 +23839,5 @@ #. 50000 #. -#. +#. #. #. @@ -23848,5 +23851,5 @@ #. 50000 #. -#. +#. #. #. @@ -23861,5 +23864,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23874,5 +23877,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23886,5 +23889,5 @@ #. 50000 #. -#. +#. #. #. @@ -23898,5 +23901,5 @@ #. 50000 #. -#. +#. #. #. @@ -23905,5 +23908,5 @@ #. 50000 #. -#. +#. #. #. @@ -23912,5 +23915,5 @@ #. 50000 #. -#. +#. #. #. @@ -23924,5 +23927,5 @@ #. 50000 #. -#. +#. #. #. @@ -23932,5 +23935,5 @@ #. 50000 #. -#. +#. #. #. @@ -23939,5 +23942,5 @@ #. 50000 #. -#. +#. #. #. @@ -23946,5 +23949,5 @@ #. 50000 #. -#. +#. #. #. @@ -23953,5 +23956,5 @@ #. 50000 #. -#. +#. #. #. @@ -23961,5 +23964,5 @@ #. 50000 #. -#. +#. #. #. @@ -23970,5 +23973,5 @@ #. 50000 #. -#. +#. #. #. @@ -23978,7 +23981,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23988,5 +23991,5 @@ #. 50000 #. -#. +#. #. #. @@ -23996,5 +23999,5 @@ #. 50000 #. -#. +#. #. #. @@ -24004,5 +24007,5 @@ #. 50000 #. -#. +#. #. #. @@ -24013,5 +24016,5 @@ #. 50000 #. -#. +#. #. #. @@ -24021,5 +24024,5 @@ #. 50000 #. -#. +#. #. #. @@ -24029,5 +24032,5 @@ #. 50000 #. -#. +#. #. #. @@ -24037,5 +24040,5 @@ #. 50000 #. -#. +#. #. #. @@ -24045,5 +24048,5 @@ #. 50000 #. -#. +#. #. #. @@ -24053,5 +24056,5 @@ #. 50000 #. -#. +#. #. #. @@ -24061,5 +24064,5 @@ #. 50000 #. -#. +#. #. #. @@ -24069,5 +24072,5 @@ #. 50000 #. -#. +#. #. #. @@ -24077,5 +24080,5 @@ #. 50000 #. -#. +#. #. #. @@ -24098,7 +24101,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24108,5 +24111,5 @@ #. 50000 #. -#. +#. #. #. @@ -24115,5 +24118,5 @@ #. 50000 #. -#. +#. #. #. @@ -24123,5 +24126,5 @@ #. 50000 #. -#. +#. #. #. @@ -24130,5 +24133,5 @@ #. 50000 #. -#. +#. #. #. @@ -24138,5 +24141,5 @@ #. 50000 #. -#. +#. #. #. @@ -24146,5 +24149,5 @@ #. 50000 #. -#. +#. #. #. @@ -24160,5 +24163,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24169,5 +24172,5 @@ #. 50000 #. -#. +#. #. #. @@ -24186,5 +24189,5 @@ #. 50000 #. -#. +#. #. #. @@ -24194,5 +24197,5 @@ #. 50000 #. -#. +#. #. #. @@ -24205,5 +24208,5 @@ #. 50000 #. -#. +#. #. #. @@ -24221,5 +24224,5 @@ #. 50000 #. -#. +#. #. #. @@ -24228,5 +24231,5 @@ #. 50000 #. -#. +#. #. #. @@ -24235,5 +24238,5 @@ #. 50000 #. -#. +#. #. #. @@ -24242,7 +24245,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24253,5 +24256,5 @@ #. 50000 #. -#. +#. #. #. @@ -24266,5 +24269,5 @@ #. 50000 #. -#. +#. #. #. @@ -24278,5 +24281,5 @@ #. 50000 #. -#. +#. #. #. @@ -24286,5 +24289,5 @@ #. 50000 #. -#. +#. #. #. @@ -24298,5 +24301,5 @@ #. 50000 #. -#. +#. #. #. @@ -24310,5 +24313,5 @@ #. 50000 #. -#. +#. #. #. @@ -24317,7 +24320,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24327,5 +24330,5 @@ #. 50000 #. -#. +#. #. #. @@ -24335,5 +24338,5 @@ #. 50000 #. -#. +#. #. #. @@ -24343,5 +24346,5 @@ #. 50000 #. -#. +#. #. #. @@ -24351,5 +24354,5 @@ #. 50000 #. -#. +#. #. #. @@ -24365,7 +24368,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24380,5 +24383,5 @@ #. 30000 #. -#. +#. #. #. @@ -24393,5 +24396,5 @@ #. 30000 #. -#. +#. #. #. @@ -24406,5 +24409,5 @@ #. 30000 #. -#. +#. #. #. @@ -24419,5 +24422,5 @@ #. 30000 #. -#. +#. #. #. @@ -24432,5 +24435,5 @@ #. 30000 #. -#. +#. #. #. @@ -24445,7 +24448,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24455,5 +24458,5 @@ #. 50000 #. -#. +#. #. #. @@ -24462,5 +24465,5 @@ #. 50000 #. -#. +#. #. #. @@ -24470,5 +24473,5 @@ #. 50000 #. -#. +#. #. #. @@ -24478,5 +24481,5 @@ #. 50000 #. -#. +#. #. #. @@ -24486,5 +24489,5 @@ #. 50000 #. -#. +#. #. #. @@ -24494,5 +24497,5 @@ #. 50000 #. -#. +#. #. #. @@ -24502,5 +24505,5 @@ #. 50000 #. -#. +#. #. #. @@ -24510,5 +24513,5 @@ #. 50000 #. -#. +#. #. #. @@ -24518,5 +24521,5 @@ #. 50000 #. -#. +#. #. #. @@ -24526,5 +24529,5 @@ #. 50000 #. -#. +#. #. #. @@ -24534,5 +24537,5 @@ #. 50000 #. -#. +#. #. #. @@ -24542,5 +24545,5 @@ #. 50000 #. -#. +#. #. #. @@ -24550,5 +24553,5 @@ #. 50000 #. -#. +#. #. #. @@ -24568,5 +24571,5 @@ #. 50000 #. -#. +#. #. #. @@ -24581,5 +24584,5 @@ #. 50000 #. -#. +#. #. #. @@ -24592,7 +24595,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24602,5 +24605,5 @@ #. 50000 #. -#. +#. #. #. @@ -24610,5 +24613,5 @@ #. 50000 #. -#. +#. #. #. @@ -24618,5 +24621,5 @@ #. 50000 #. -#. +#. #. #. @@ -24626,5 +24629,5 @@ #. 50000 #. -#. +#. #. #. @@ -24634,5 +24637,5 @@ #. 50000 #. -#. +#. #. #. @@ -24642,5 +24645,5 @@ #. 50000 #. -#. +#. #. #. @@ -24650,5 +24653,5 @@ #. 50000 #. -#. +#. #. #. @@ -24658,5 +24661,5 @@ #. 50000 #. -#. +#. #. #. @@ -24666,5 +24669,5 @@ #. 50000 #. -#. +#. #. #. @@ -24674,5 +24677,5 @@ #. 50000 #. -#. +#. #. #. @@ -24682,5 +24685,5 @@ #. 50000 #. -#. +#. #. #. @@ -24690,5 +24693,5 @@ #. 50000 #. -#. +#. #. #. @@ -24698,5 +24701,5 @@ #. 50000 #. -#. +#. #. #. @@ -24706,5 +24709,5 @@ #. 50000 #. -#. +#. #. #. @@ -24725,5 +24728,5 @@ #. 50000 #. -#. +#. #. #. @@ -24737,7 +24740,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24747,5 +24750,5 @@ #. 50000 #. -#. +#. #. #. @@ -24755,5 +24758,5 @@ #. 50000 #. -#. +#. #. #. @@ -24763,5 +24766,5 @@ #. 50000 #. -#. +#. #. #. @@ -24771,5 +24774,5 @@ #. 50000 #. -#. +#. #. #. @@ -24779,5 +24782,5 @@ #. 50000 #. -#. +#. #. #. @@ -24787,5 +24790,5 @@ #. 50000 #. -#. +#. #. #. @@ -24795,5 +24798,5 @@ #. 50000 #. -#. +#. #. #. @@ -24810,5 +24813,5 @@ #. 50000 #. -#. +#. #. #. @@ -24818,5 +24821,5 @@ #. 50000 #. -#. +#. #. #. @@ -24826,5 +24829,5 @@ #. 50000 #. -#. +#. #. #. @@ -24834,5 +24837,5 @@ #. 50000 #. -#. +#. #. #. @@ -24842,5 +24845,5 @@ #. 50000 #. -#. +#. #. #. @@ -24850,5 +24853,5 @@ #. 50000 #. -#. +#. #. #. @@ -24858,5 +24861,5 @@ #. 50000 #. -#. +#. #. #. @@ -24866,5 +24869,5 @@ #. 50000 #. -#. +#. #. #. @@ -24874,5 +24877,5 @@ #. 50000 #. -#. +#. #. #. @@ -24882,5 +24885,5 @@ #. 50000 #. -#. +#. #. #. @@ -24890,5 +24893,5 @@ #. 50000 #. -#. +#. #. #. @@ -24898,5 +24901,5 @@ #. 50000 #. -#. +#. #. #. @@ -24915,5 +24918,5 @@ #. 50000 #. -#. +#. #. #. @@ -24923,5 +24926,5 @@ #. 50000 #. -#. +#. #. #. @@ -24930,5 +24933,5 @@ #. 50000 #. -#. +#. #. #. @@ -24938,5 +24941,5 @@ #. 50000 #. -#. +#. #. #. @@ -24946,5 +24949,5 @@ #. 50000 #. -#. +#. #. #. @@ -24954,5 +24957,5 @@ #. 50000 #. -#. +#. #. #. @@ -24961,5 +24964,5 @@ #. 50000 #. -#. +#. #. #. @@ -24969,5 +24972,5 @@ #. 50000 #. -#. +#. #. #. @@ -24977,5 +24980,5 @@ #. 50000 #. -#. +#. #. #. @@ -24985,5 +24988,5 @@ #. 50000 #. -#. +#. #. #. @@ -24993,5 +24996,5 @@ #. 50000 #. -#. +#. #. #. @@ -25000,5 +25003,5 @@ #. 50000 #. -#. +#. #. #. @@ -25007,5 +25010,5 @@ #. 50000 #. -#. +#. #. #. @@ -25014,5 +25017,5 @@ #. 50000 #. -#. +#. #. #. @@ -25021,5 +25024,5 @@ #. 50000 #. -#. +#. #. #. @@ -25028,5 +25031,5 @@ #. 50000 #. -#. +#. #. #. @@ -25035,5 +25038,5 @@ #. 50000 #. -#. +#. #. #. @@ -25042,5 +25045,5 @@ #. 50000 #. -#. +#. #. #. @@ -25049,5 +25052,5 @@ #. 50000 #. -#. +#. #. #. @@ -25056,5 +25059,5 @@ #. 50000 #. -#. +#. #. #. @@ -25063,5 +25066,5 @@ #. 50000 #. -#. +#. #. #. @@ -25070,5 +25073,5 @@ #. 50000 #. -#. +#. #. #. @@ -25077,5 +25080,5 @@ #. 50000 #. -#. +#. #. #. @@ -25084,5 +25087,5 @@ #. 50000 #. -#. +#. #. #. @@ -25092,5 +25095,5 @@ #. 50000 #. -#. +#. #. #. @@ -25100,5 +25103,5 @@ #. 50000 #. -#. +#. #. #. @@ -25108,5 +25111,5 @@ #. 50000 #. -#. +#. #. #. @@ -25116,5 +25119,5 @@ #. 50000 #. -#. +#. #. #. @@ -25124,5 +25127,5 @@ #. 50000 #. -#. +#. #. #. @@ -25132,5 +25135,5 @@ #. 50000 #. -#. +#. #. #. @@ -25140,5 +25143,5 @@ #. 50000 #. -#. +#. #. #. @@ -25148,5 +25151,5 @@ #. 50000 #. -#. +#. #. #. @@ -25156,5 +25159,5 @@ #. 50000 #. -#. +#. #. #. @@ -25165,5 +25168,5 @@ #. 50000 #. -#. +#. #. #. @@ -25173,5 +25176,5 @@ #. 50000 #. -#. +#. #. #. @@ -25181,5 +25184,5 @@ #. 50000 #. -#. +#. #. #. @@ -25189,5 +25192,5 @@ #. 50000 #. -#. +#. #. #. @@ -25197,5 +25200,5 @@ #. 50000 #. -#. +#. #. #. @@ -25205,5 +25208,5 @@ #. 50000 #. -#. +#. #. #. @@ -25213,5 +25216,5 @@ #. 50000 #. -#. +#. #. #. @@ -25221,5 +25224,5 @@ #. 50000 #. -#. +#. #. #. @@ -25229,5 +25232,5 @@ #. 50000 #. -#. +#. #. #. @@ -25237,5 +25240,5 @@ #. 50000 #. -#. +#. #. #. @@ -25245,5 +25248,5 @@ #. 50000 #. -#. +#. #. #. @@ -25253,5 +25256,5 @@ #. 50000 #. -#. +#. #. #. @@ -25261,5 +25264,5 @@ #. 50000 #. -#. +#. #. #. @@ -25269,5 +25272,5 @@ #. 50000 #. -#. +#. #. #. @@ -25277,5 +25280,5 @@ #. 50000 #. -#. +#. #. #. @@ -25285,5 +25288,5 @@ #. 50000 #. -#. +#. #. #. @@ -25293,5 +25296,5 @@ #. 50000 #. -#. +#. #. #. @@ -25301,5 +25304,5 @@ #. 50000 #. -#. +#. #. #. @@ -25309,5 +25312,5 @@ #. 50000 #. -#. +#. #. #. @@ -25316,5 +25319,5 @@ #. 50000 #. -#. +#. #. #. @@ -25346,5 +25349,5 @@ #. 50000 #. -#. +#. #. #. @@ -25354,5 +25357,5 @@ #. 50000 #. -#. +#. #. #. @@ -25362,7 +25365,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25377,5 +25380,5 @@ #. 50000 #. -#. +#. #. #. @@ -25385,5 +25388,5 @@ #. 50000 #. -#. +#. #. #. @@ -25393,5 +25396,5 @@ #. 50000 #. -#. +#. #. #. @@ -25401,5 +25404,5 @@ #. 50000 #. -#. +#. #. #. @@ -25409,5 +25412,5 @@ #. 50000 #. -#. +#. #. #. @@ -25417,5 +25420,5 @@ #. 50000 #. -#. +#. #. #. @@ -25425,5 +25428,5 @@ #. 50000 #. -#. +#. #. #. @@ -25439,7 +25442,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25449,5 +25452,5 @@ #. 50000 #. -#. +#. #. #. @@ -25457,5 +25460,5 @@ #. 50000 #. -#. +#. #. #. @@ -25465,5 +25468,5 @@ #. 50000 #. -#. +#. #. #. @@ -25473,5 +25476,5 @@ #. 50000 #. -#. +#. #. #. @@ -25481,5 +25484,5 @@ #. 50000 #. -#. +#. #. #. @@ -25489,5 +25492,5 @@ #. 50000 #. -#. +#. #. #. @@ -25497,5 +25500,5 @@ #. 50000 #. -#. +#. #. #. @@ -25505,5 +25508,5 @@ #. 50000 #. -#. +#. #. #. @@ -25513,5 +25516,5 @@ #. 50000 #. -#. +#. #. #. @@ -25521,5 +25524,5 @@ #. 50000 #. -#. +#. #. #. @@ -25529,5 +25532,5 @@ #. 50000 #. -#. +#. #. #. @@ -25537,5 +25540,5 @@ #. 50000 #. -#. +#. #. #. @@ -25545,5 +25548,5 @@ #. 50000 #. -#. +#. #. #. @@ -25553,5 +25556,5 @@ #. 50000 #. -#. +#. #. #. @@ -25561,5 +25564,5 @@ #. 50000 #. -#. +#. #. #. @@ -25569,5 +25572,5 @@ #. 50000 #. -#. +#. #. #. @@ -25577,5 +25580,5 @@ #. 50000 #. -#. +#. #. #. @@ -25585,5 +25588,5 @@ #. 50000 #. -#. +#. #. #. @@ -25593,5 +25596,5 @@ #. 50000 #. -#. +#. #. #. @@ -25601,5 +25604,5 @@ #. 50000 #. -#. +#. #. #. @@ -25609,5 +25612,5 @@ #. 50000 #. -#. +#. #. #. @@ -25617,5 +25620,5 @@ #. 50000 #. -#. +#. #. #. @@ -25625,5 +25628,5 @@ #. 50000 #. -#. +#. #. #. @@ -25633,5 +25636,5 @@ #. 50000 #. -#. +#. #. #. @@ -25641,5 +25644,5 @@ #. 50000 #. -#. +#. #. #. @@ -25649,5 +25652,5 @@ #. 50000 #. -#. +#. #. #. @@ -25657,5 +25660,5 @@ #. 50000 #. -#. +#. #. #. @@ -25665,5 +25668,5 @@ #. 50000 #. -#. +#. #. #. @@ -25673,5 +25676,5 @@ #. 50000 #. -#. +#. #. #. @@ -25681,5 +25684,5 @@ #. 50000 #. -#. +#. #. #. @@ -25689,5 +25692,5 @@ #. 50000 #. -#. +#. #. #. @@ -25697,5 +25700,5 @@ #. 50000 #. -#. +#. #. #. @@ -25705,5 +25708,5 @@ #. 50000 #. -#. +#. #. #. @@ -25713,5 +25716,5 @@ #. 50000 #. -#. +#. #. #. @@ -25721,5 +25724,5 @@ #. 50000 #. -#. +#. #. #. @@ -25729,5 +25732,5 @@ #. 50000 #. -#. +#. #. #. @@ -25737,5 +25740,5 @@ #. 50000 #. -#. +#. #. #. @@ -25745,5 +25748,5 @@ #. 50000 #. -#. +#. #. #. @@ -25753,5 +25756,5 @@ #. 50000 #. -#. +#. #. #. @@ -25761,5 +25764,5 @@ #. 50000 #. -#. +#. #. #. @@ -25769,5 +25772,5 @@ #. 50000 #. -#. +#. #. #. @@ -25777,5 +25780,5 @@ #. 50000 #. -#. +#. #. #. @@ -25811,7 +25814,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25821,5 +25824,5 @@ #. 50000 #. -#. +#. #. #. @@ -25829,5 +25832,5 @@ #. 50000 #. -#. +#. #. #. @@ -25837,5 +25840,5 @@ #. 50000 #. -#. +#. #. #. @@ -25845,5 +25848,5 @@ #. 50000 #. -#. +#. #. #. @@ -25853,5 +25856,5 @@ #. 50000 #. -#. +#. #. #. @@ -25861,5 +25864,5 @@ #. 50000 #. -#. +#. #. #. @@ -25869,5 +25872,5 @@ #. 50000 #. -#. +#. #. #. @@ -25884,5 +25887,5 @@ #. 50000 #. -#. +#. #. #. @@ -25892,5 +25895,5 @@ #. 50000 #. -#. +#. #. #. @@ -25900,5 +25903,5 @@ #. 50000 #. -#. +#. #. #. @@ -25908,5 +25911,5 @@ #. 50000 #. -#. +#. #. #. @@ -25916,5 +25919,5 @@ #. 50000 #. -#. +#. #. #. @@ -25924,5 +25927,5 @@ #. 50000 #. -#. +#. #. #. @@ -25933,5 +25936,5 @@ #. 50000 #. -#. +#. #. #. @@ -25941,5 +25944,5 @@ #. 50000 #. -#. +#. #. #. @@ -25949,5 +25952,5 @@ #. 40000 #. -#. +#. #. #. @@ -25957,5 +25960,5 @@ #. 50000 #. -#. +#. #. #. @@ -25964,5 +25967,5 @@ #. 40000 #. -#. +#. #. #. @@ -25971,5 +25974,5 @@ #. 40000 #. -#. +#. #. #. @@ -25987,7 +25990,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25997,5 +26000,5 @@ #. 50000 #. -#. +#. #. #. @@ -26005,5 +26008,5 @@ #. 50000 #. -#. +#. #. #. @@ -26013,5 +26016,5 @@ #. 50000 #. -#. +#. #. #. @@ -26021,5 +26024,5 @@ #. 50000 #. -#. +#. #. #. @@ -26029,5 +26032,5 @@ #. 50000 #. -#. +#. #. #. @@ -26037,5 +26040,5 @@ #. 50000 #. -#. +#. #. #. @@ -26045,5 +26048,5 @@ #. 50000 #. -#. +#. #. #. @@ -26053,5 +26056,5 @@ #. 50000 #. -#. +#. #. #. @@ -26061,5 +26064,5 @@ #. 50000 #. -#. +#. #. #. @@ -26078,5 +26081,5 @@ #. 50000 #. -#. +#. #. #. @@ -26090,5 +26093,5 @@ #. 50000 #. -#. +#. #. #. @@ -26102,5 +26105,5 @@ #. 50000 #. -#. +#. #. #. @@ -26110,5 +26113,5 @@ #. 50000 #. -#. +#. #. #. @@ -26122,5 +26125,5 @@ #. 50000 #. -#. +#. #. #. @@ -26134,5 +26137,5 @@ #. 50000 #. -#. +#. #. #. @@ -26146,6 +26149,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26155,5 +26158,5 @@ #. 50000 #. -#. +#. #. #. @@ -26167,5 +26170,5 @@ #. 50000 #. -#. +#. #. #. @@ -26179,5 +26182,5 @@ #. 50000 #. -#. +#. #. #. @@ -26191,5 +26194,5 @@ #. 50000 #. -#. +#. #. #. @@ -26203,5 +26206,5 @@ #. 50000 #. -#. +#. #. #. @@ -26215,5 +26218,5 @@ #. 50000 #. -#. +#. #. #. @@ -26223,7 +26226,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26233,5 +26236,5 @@ #. 50000 #. -#. +#. #. #. @@ -26241,5 +26244,5 @@ #. 50000 #. -#. +#. #. #. @@ -26249,5 +26252,5 @@ #. 50000 #. -#. +#. #. #. @@ -26257,5 +26260,5 @@ #. 50000 #. -#. +#. #. #. @@ -26272,5 +26275,5 @@ #. 50000 #. -#. +#. #. #. @@ -26283,5 +26286,5 @@ #. 50000 #. -#. +#. #. #. @@ -26295,5 +26298,5 @@ #. 50000 #. -#. +#. #. #. @@ -26307,5 +26310,5 @@ #. 50000 #. -#. +#. #. #. @@ -26319,5 +26322,5 @@ #. 50000 #. -#. +#. #. #. @@ -26328,5 +26331,5 @@ #. 50000 #. -#. +#. #. #. @@ -26336,5 +26339,5 @@ #. 50000 #. -#. +#. #. #. @@ -26344,5 +26347,5 @@ #. 50000 #. -#. +#. #. #. @@ -26352,5 +26355,5 @@ #. 50000 #. -#. +#. #. #. @@ -26360,5 +26363,5 @@ #. 50000 #. -#. +#. #. #. @@ -26375,5 +26378,5 @@ #. 50000 #. -#. +#. #. #. @@ -26387,5 +26390,5 @@ #. 50000 #. -#. +#. #. #. @@ -26399,5 +26402,5 @@ #. 50000 #. -#. +#. #. #. @@ -26411,5 +26414,5 @@ #. 50000 #. -#. +#. #. #. @@ -26423,5 +26426,5 @@ #. 50000 #. -#. +#. #. #. @@ -26435,5 +26438,5 @@ #. 50000 #. -#. +#. #. #. @@ -26442,7 +26445,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26452,5 +26455,5 @@ #. 50000 #. -#. +#. #. #. @@ -26460,5 +26463,5 @@ #. 50000 #. -#. +#. #. #. @@ -26468,5 +26471,5 @@ #. 50000 #. -#. +#. #. #. @@ -26476,5 +26479,5 @@ #. 50000 #. -#. +#. #. #. @@ -26484,5 +26487,5 @@ #. 50000 #. -#. +#. #. #. @@ -26492,5 +26495,5 @@ #. 50000 #. -#. +#. #. #. @@ -26500,5 +26503,5 @@ #. 50000 #. -#. +#. #. #. @@ -26515,7 +26518,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26525,5 +26528,5 @@ #. 50000 #. -#. +#. #. #. @@ -26533,5 +26536,5 @@ #. 50000 #. -#. +#. #. #. @@ -26541,5 +26544,5 @@ #. 50000 #. -#. +#. #. #. @@ -26549,5 +26552,5 @@ #. 50000 #. -#. +#. #. #. @@ -26563,5 +26566,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26610,5 +26613,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26618,5 +26621,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26626,5 +26629,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26634,5 +26637,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26642,5 +26645,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26650,5 +26653,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26658,5 +26661,5 @@ #. 50000 #. -#. +#. #. #. @@ -26666,5 +26669,5 @@ #. 50000 #. -#. +#. #. #. @@ -26674,5 +26677,5 @@ #. 50000 #. -#. +#. #. #. @@ -26682,5 +26685,5 @@ #. 50000 #. -#. +#. #. #. @@ -26690,5 +26693,5 @@ #. 50000 #. -#. +#. #. #. @@ -26698,5 +26701,5 @@ #. 50000 #. -#. +#. #. #. @@ -26716,5 +26719,5 @@ #. 50000 #. -#. +#. #. #. @@ -26723,5 +26726,5 @@ #. 50000 #. -#. +#. #. #. @@ -26730,5 +26733,5 @@ #. 50000 #. -#. +#. #. #. @@ -26737,5 +26740,5 @@ #. 40000 #. -#. +#. #. #. @@ -26744,5 +26747,5 @@ #. 40000 #. -#. +#. #. #. @@ -26751,5 +26754,5 @@ #. 40000 #. -#. +#. #. #. @@ -26844,5 +26847,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -26850,28 +26853,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 @@ -26986,5 +26989,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -26997,5 +27000,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27020,6 +27023,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27028,6 +27031,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27042,6 +27045,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 @@ -27055,6 +27058,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 @@ -27074,6 +27077,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27097,6 +27100,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 @@ -27109,4 +27112,52 @@ msgstr "" +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Točka {0} x {1} nima časovne oznake" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Ni moč najti slik z berljivo časovno oznako." + +#~ msgid "GPS start: {0}" +#~ msgstr "Začetek GPS sledi: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "Konec GPS sledi: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "trenutna razlika: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "razlika časovnih pasov: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} znotraj sledi." + +#~ msgid "Sync clock" +#~ msgstr "Uskladi uro" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Datuma v datoteki \"{0}\" ni bilo možno razbrati." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "V datoteki \"{0}\" manjka EXIF čas." + +#~ msgid "Image" +#~ msgstr "Slika" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Vnesite prikazan čas (mm/dd/yyyy HH:MM:SS)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Uskladite čas z GPS napravo" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Vpisanega časa ni bilo mogoče razpoznati." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - slike z geografskim položajem" + #~ msgid "Move" #~ msgstr "Premakni" @@ -27118,7 +27169,4 @@ #~ msgstr "Nič podatkov ni bilo uvoženih." -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Prosim, vnesite želene koordinate." - #~ msgid "Select a bookmark first." #~ msgstr "Najprej izberite zaznamek." @@ -27127,5 +27175,4 @@ #~ msgstr "Datoteke ni bilo moč najti." -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Ni možno odpreti imenika z nastavitvami: {0}" @@ -27143,5 +27190,4 @@ #~ msgstr "Predmet" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27192,11 +27238,6 @@ #~ msgstr "Datoteke ni mogoče najti" -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Sprejem vstavka {0} z naslova {1} ni bil mogoč" - -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Izbriši {1} {0}" #~ msgid "Combine ways with different memberships?" @@ -27207,7 +27248,4 @@ #~ "Za premikanje in povečavo lahko uporabite miško ali +." -#~ msgid "Please enter a search string" -#~ msgstr "Prosim, vpišite iskani niz" - #~ msgid "Cannot read place search results from server" #~ msgstr "Rezultata iskanja kraja se ne da prebrati s strežnika" @@ -27243,9 +27281,10 @@ #~ msgstr "Neveljaven id točke" -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" -#~ "Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno sprejeti." +#~ "Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno " +#~ "sprejeti." #~ msgid "Upload to OSM..." @@ -27256,6 +27295,6 @@ #~ "about the problem." #~ msgstr "" -#~ "Vstavka ni bilo mogoče odstraniti. Prosimo. povejte to ljudem od katerih ste " -#~ "dobili JOSM." +#~ "Vstavka ni bilo mogoče odstraniti. Prosimo. povejte to ljudem od katerih " +#~ "ste dobili JOSM." #~ msgid "" @@ -27267,13 +27306,9 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" #~ "Preden prijavite napako poskusite posodobiti JOSM na najnovejšo različico." -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Napaka pri brisanju datoteke vstavka: {0}" - #~ msgid "Plugin already exists" #~ msgstr "Vstavek že obstaja" @@ -27285,9 +27320,7 @@ #~ msgstr "Prenos prekinjen zaradi napake (5 sekund premora):" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Vstavek zahteva posodobitev programa JOSM: {0}." -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Prosimo, prijavite težavo na {0}" @@ -27313,10 +27346,10 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" -#~ "POZOR: Geslo je shranjeno v datoteki z nastavitvami v obliki navadnega " -#~ "besedila.
Geslo se na strežnik prenaša nekriptirano v naslovu " -#~ "URL.
Ne uporabljaj gesla enakega nekeu drugemu pomembnemu " +#~ "POZOR: Geslo je shranjeno v datoteki z nastavitvami v obliki " +#~ "navadnega besedila.
Geslo se na strežnik prenaša nekriptirano v " +#~ "naslovu URL.
Ne uporabljaj gesla enakega nekeu drugemu pomembnemu " #~ "geslu." @@ -27324,9 +27357,7 @@ #~ msgstr "Oprostite, to ne deluje z anonimnimi uporabniki" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Uporabi prednastavitev ''{0}''" @@ -27353,5 +27384,4 @@ #~ msgstr "Vse poti so bile prazne" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Napaka pri nalaganju strani {0}" Index: /applications/editors/josm/i18n/po/sv.po =================================================================== --- /applications/editors/josm/i18n/po/sv.po (revision 18974) +++ /applications/editors/josm/i18n/po/sv.po (revision 18975) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 16:20+0100\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" "PO-Revision-Date: 2009-11-17 18:09+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\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" @@ -29,6 +29,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 @@ -45,7 +45,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 @@ -61,19 +61,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 @@ -86,9 +85,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" @@ -116,5 +115,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 @@ -137,9 +136,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 @@ -155,20 +154,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 @@ -187,7 +182,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 "Fel" @@ -267,5 +262,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 "Insticksmoduler" @@ -310,4 +305,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 @@ -315,8 +312,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 @@ -326,29 +323,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 @@ -377,9 +372,9 @@ #, java-format msgid "" -"There are no layers the source layer
''{0}''
could be merged " -"to." -msgstr "" -"Det finns inga lager som lagret
''{0}''
kan sammanfogas " -"med." +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" +"Det finns inga lager som lagret
''{0}''
kan sammanfogas med." #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 @@ -430,14 +425,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 "Latitud" #: ../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 "Longitud" @@ -463,10 +458,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 @@ -497,19 +492,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 @@ -518,9 +516,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 @@ -536,7 +531,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 @@ -548,11 +543,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" @@ -640,5 +635,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}" @@ -693,10 +688,10 @@ "noder av dem)" -#: ../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 "Slå ihop {0} sträckor" -#: ../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 "Välj åtminstone två sträckor att slå ihop" @@ -715,19 +710,19 @@ msgstr "Välj någonting att kopiera." +#: ../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 "Skapa cirkel" -#: ../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 "Skapa en cirkel av tre valda noder." -#: ../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 "Noderna är inte i en cirkel. Avbryter." -#: ../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 " @@ -740,9 +735,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 @@ -815,21 +810,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" @@ -837,6 +836,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 @@ -865,5 +864,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 "Duplicera" @@ -920,8 +919,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 @@ -929,5 +926,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 @@ -940,8 +937,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 @@ -960,8 +957,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 @@ -984,13 +981,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 @@ -1030,4 +1028,106 @@ msgstr "Visa objektinformation om OSM noder, vägar eller relationer." +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Join overlapping Areas" +msgstr "Förena överlappande ytor" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102 +msgid "Joins areas that overlap each other" +msgstr "Förena ytor som överlappar varandra" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130 +msgid "Only up to two areas can be joined at the moment." +msgstr "För närvarande kan enbart upp till två ytor förenas." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135 +#, java-format +msgid "\"{0}\" is not closed and therefore can't be joined." +msgstr "\"{0}\" är inte sluten, och kan därför inte förenas med andra ytor." + +#: ../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 "" +"Den eller de valda sträckorna har noder som ligger utanför det område för " +"vilket data har hämtats.\n" +"Detta kan leda till att noder oavsiktligt tas bort.\n" +"Är du säker på att du vill fortsätta?" + +#: ../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 "Avbryt om du är osäker" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171 +msgid "Please select at least one closed way the should be joined." +msgstr "Välj åtminstone en sluten väg som skall förenas." + +#: ../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 "La till nod vid alla korsande sträckor" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 +msgid "Delete Ways that are not part of an inner multipolygon" +msgstr "Ta bort sträckor som inte är del av en inre multipolygon" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 +msgid "Fix relations" +msgstr "Korrigera relationer" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 +msgid "Joined self-overlapping area" +msgstr "Slog ihop område som låg ovanpå sig själv" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +msgid "Joined overlapping areas" +msgstr "Slog ihop områden som låg ovanpå varandra" + +#: ../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 "" +"Några av sträckorna var medlemmar i relationer som har ändrats. Kontrollera " +"att det inte har uppstått några fel." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306 +msgid "Enter values for all conflicts." +msgstr "Ange värden för alla konflikter" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Jämka konflikter" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322 +msgid "Fix tag conflicts" +msgstr "Korrigera taggkonflikter" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483 +msgid "Removed Element from Relations" +msgstr "Tog bort element från relation" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607 +msgid "Join Areas: Remove Short Ways" +msgstr "Slå ihop områden: Ta bort korta sträckor" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623 +msgid "Closed Way" +msgstr "Sluten sträcka" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911 +msgid "Remove tags from inner ways" +msgstr "Ta bort taggar från inre sträckor" + +#: ../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 @@ -1047,4 +1147,46 @@ msgstr "Inget kortkommando" +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Jump To Position" +msgstr "Gå till plats" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31 +msgid "Opens a dialog that allows to jump to a specific location" +msgstr "Öppnar en dialogruta som gör att man kan gå direkt till en viss plats" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57 +msgid "Enter Lat/Lon to jump to position." +msgstr "Ange lat/lon för att gå direkt till plats." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 +msgid "You can also paste an URL from www.openstreetmap.org" +msgstr "Du kan också klistra in en URL från www.openstreetmap.org" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 +msgid "Zoom (in metres)" +msgstr "Zoomnivå (meter)" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 +msgid "URL" +msgstr "URL" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 +msgid "Jump there" +msgstr "Gå direkt dit" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104 +msgid "Jump to Position" +msgstr "Gå direkt till plats" + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Could not parse Latitude, Longitude or Zoom. Please check." +msgstr "" +"Kunde inte tolka latitude, longitude eller zoomnivå. Kontrollera värdena." + +#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 +msgid "Unable to parse Lon/Lat" +msgstr "Kunde inte tolka lon/lat" + #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" @@ -1055,26 +1197,26 @@ msgstr "Sammafoga det nuvarande lagret med ett annat" +#: ../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 "Slå ihop noder" -#: ../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 "Slå ihop noder med den äldsta." -#: ../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 "Välj åtminstone två noder att slå ihop." -#: ../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 "" @@ -1082,5 +1224,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" @@ -1460,6 +1602,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 "" "Visa statusrapport med information som kan vara av nytta vid felrapportering." @@ -1480,9 +1621,44 @@ #: ../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 "Stäng" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Simplify Way" +msgstr "Förenkla sträcka" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Ta bort onödiga noder från en sträcka." + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "Välj åtminstone en sträcka att förenkla." + +#: ../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] "" +"Urvalet innehåller {0} sträcka. Är du säker på att du vill förenkla den?" +msgstr[1] "" +"Urvalet innehåller {0} sträckor. Är du säker på att du vill förenkla dem " +"alla?" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 +msgid "Are you sure?" +msgstr "Är du säker?" + +#: ../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] "Förenkla sträcka (ta bort {0} nod)" +msgstr[1] "Förenkla sträcka (ta bort {0} noder)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1611,6 +1787,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 "" "* En nod som används av mer än en sträcka samt en av dessa sträckor, eller" @@ -1696,54 +1871,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 "Inget dataset kunde hittas" -#: ../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 "Uppdatera markering" +#: ../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 "Tom markering" -#: ../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 "" @@ -1752,35 +1927,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 "Det finns inte några ändringar att skicka in." -#: ../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 "Det finns inte någonting att skicka in. Skaffa lite data först." -#: ../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 "Synkronisera hela datasetet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256 #, java-format msgid "" @@ -1788,33 +1963,31 @@ "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.
" +"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 "" "Uppladdning misslyckadesav någon av dina noder, vägar eller relationer.

Klicka på " -"{0} för att synkronisera all lokal data med " -"servern.
Klicka på {1} för att avbryta och fortsätta " -"redigera.
" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 +"{0} för att synkronisera all lokal data med servern." +"
Klicka på {1} för att avbryta och fortsätta redigera." +"
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1824,22 +1997,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 "" @@ -1850,15 +2023,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 "Uppdaterar primitiv" @@ -1870,6 +2043,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 "" @@ -1878,38 +2051,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 "" @@ -2073,12 +2245,12 @@ "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 "" "Det finns {0} primitiver i din data som kanske
är borttagna från " "servern. Om du senare försöker ta bort eller
uppdatera de från servern " -"kommer det troligtvis leda till
en konflikt.

Klicka på " -"{1} för att kontrollera statusen på dessa primitiv
på " -"servern.
Klicka på {2} för att ignorera.
" +"kommer det troligtvis leda till
en konflikt.

Klicka på {1}" +" för att kontrollera statusen på dessa primitiv
på servern." +"
Klicka på {2} för att ignorera.
" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183 @@ -2146,38 +2318,38 @@ msgstr "markerad" -#: ../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 "Det går inte att lägga till en nod utanför världen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Lägg till nod" -#: ../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 "Lägg till en nod till sträckan" -#: ../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 "Knyt en existerande nod till en sträcka" -#: ../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 "Lägg till en ny nod i en befintlig sträcka" -#: ../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 "Lägg till en nod i en sträcka och bind ihop" -#: ../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 "Skapa ny nod" -#: ../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 "Markera nod under pekare." -#: ../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." @@ -2186,14 +2358,14 @@ msgstr[1] "Infoga ny nod i {0} vägar." -#: ../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 "Starta ny väg från senaste nod." -#: ../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 "Fortsätt väg från senaste nod." -#: ../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 "Avsluta ritning." @@ -2228,6 +2400,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 "" "Dra spelhuvudet och släpp i närheten av spår för att spela upp ljud " @@ -2330,5 +2502,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." @@ -2417,12 +2589,17 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#, fuzzy +msgid "user:anonymous - all objects changed by anonymous users" +msgstr "user:... - alla objekt som ändrats av användare..." + +#: ../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 "nodes:... - objekt med givent antal noder" -#: ../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-" @@ -2430,35 +2607,35 @@ 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 "modified - alla ändrade objekt" -#: ../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 "selected - alla valda objekt" -#: ../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 "incomplete - alla ofullständiga objekt" -#: ../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 "otaggade - alla otaggede objekt" -#: ../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 "Använd | eller OR för att kombinera med logiskt ELLER" -#: ../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 "" @@ -2466,9 +2643,9 @@ "innehåller :)" -#: ../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 "Använd ( och ) för att gruppera uttryck" -#: ../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 @@ -2478,55 +2655,55 @@ msgstr "Filter" -#: ../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 "Sök" -#: ../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 "Påbörja sökning" -#: ../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 "Inga sökträffar för ''{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 "Urvalet utökades inte genom att söka efter ''{0}''" -#: ../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 "Urvalet begränsades inte genom att söka efter ''{0}''" -#: ../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} sökträffar" -#: ../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 "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2540,40 +2717,40 @@ "{2}" -#: ../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 "Det saknas argument för eller (or)." -#: ../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 "Det saknas argument för inte (not)." -#: ../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 "En avslutande parentes förväntades" -#: ../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 "" @@ -2582,9 +2759,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 "Felaktigt antal parametrar för nodoperator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 #, java-format msgid "" @@ -2593,5 +2770,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." @@ -2642,8 +2819,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75 -#, java-format -msgid "" -"Warning: automatically truncating value of tag ''{0}'' on deleted primitive " -"{1}" +#, fuzzy, java-format +msgid "" +"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" msgstr "" "VARNING: trunkerar automatiskt värde för tagg \"{0}\" på borttagen primitiv " @@ -2651,7 +2827,7 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 -#, java-format -msgid "" -"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed " +#, fuzzy, java-format +msgid "" +"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed " "length {2}. Values length is {3}." msgstr "" @@ -2790,5 +2966,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 "" @@ -2807,5 +2983,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 "" @@ -2824,19 +3001,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" @@ -2845,5 +3022,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" @@ -2852,5 +3029,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" @@ -2859,5 +3036,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" @@ -2868,10 +3045,10 @@ #. 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?" +#: ../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 "" "Du håller på att ta bort noder utanför det område som du har hämtat hem.
" @@ -2879,5 +3056,5 @@ "använder dem.
Vill du verkligen ta bort dem?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "" @@ -2895,15 +3072,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 "" @@ -2912,5 +3089,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}" @@ -2921,11 +3098,4 @@ 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 "" -"Kan inte ångra kommando \"{0}\" eftersom lager \"{1}\" inte längre är " -"närvarande" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3004,5 +3174,5 @@ msgstr "Tillämpa?" -#: ../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 " @@ -3147,6 +3317,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 "" @@ -3229,5 +3399,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3236,5 +3406,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3242,25 +3412,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 "S" #. 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 "N" #. 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 "V" #. 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 @@ -3283,25 +3453,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}" @@ -3309,6 +3480,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 "" @@ -3371,24 +3542,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 " @@ -3396,5 +3567,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 "" @@ -3426,6 +3597,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}." @@ -3446,5 +3617,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 @@ -3456,6 +3626,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 "" @@ -3466,135 +3635,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 "En sträcka för en yta är inte sluten." -#: ../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 "Multipolygonsträckan ''{0}'' är inte sluten." -#: ../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 "Tog bort medlemmen ''{0}'' i relationen." -#: ../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 "Sträcka \"{0} med mindre än två punkter." -#: ../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 "Det finns mer än en \"från\"-sträcka." -#: ../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 "Det finns mer än en \"till\"-sträcka." -#: ../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 "Mer än en \"via\" hittades." -#: ../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 "Okänd roll ''{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 "Okänd medlemstyp för ''{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 "Det finns inte någon \"från\"-sträcka." -#: ../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 "Det finns inte någon \"till\"-sträcka." -#: ../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 "Ingen nod eller sträcka för \"via\" hittades." -#: ../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 "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 +#: ../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 "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod." -#: ../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 "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan." -#: ../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 "Stil för restriktion {0} kunde inte hittas." -#: ../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 "Intersektionen mellan sträckorna ''{0}'' och ''{1}''." -#: ../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 "Den inre sträckan ''{0}'' befinner sig utanför." -#: ../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 "Ingen användbar roll ''{0}'' för sträckan ''{1}''." -#: ../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 "Icke-sträcka ''{0}'' i multipolygon." -#: ../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 "Multipolygonen ''{0}'' saknar yttre sträcka." -#: ../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 "Stil för inre väg ''{0}'' är samma som multipolygonen." -#: ../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 "Stil för yttre väg ''{0}'' passar inte." -#: ../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 "otaggade" -#: ../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 "text" -#: ../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 "Fel: {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}" @@ -3606,5 +3775,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 @@ -3623,5 +3792,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 @@ -3641,5 +3810,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 "bakgrund" @@ -3757,6 +3926,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 "" @@ -3771,5 +3939,5 @@ msgstr "Visa inte igen" -#: ../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 @@ -3777,32 +3945,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 "ofullständig" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "landsväg" -#: ../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 "järnväg" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "vattendrag" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "markanvändning" -#: ../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" @@ -3811,5 +3979,5 @@ msgstr[1] "{0} noder" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -3904,6 +4072,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "" -"Ändra storleken på appleten till angiven geometri (format: BREDDxHÖJD)" +msgstr "Ändra storleken på appleten till angiven geometri (format: BREDDxHÖJD)" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 @@ -3943,6 +4110,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 msgid "If specified, reset the configuration instead of reading it." -msgstr "" -"Om angivet så återställ konfigurationen istället för att läsa in den." +msgstr "Om angivet så återställ konfigurationen istället för att läsa in den." #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 @@ -4060,12 +4226,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Arkiv" -#: ../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 @@ -4079,19 +4245,19 @@ msgstr "Redigera" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Visa" -#: ../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 "Verktyg" -#: ../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 "Snabbval" -#: ../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 @@ -4102,5 +4268,5 @@ msgstr "Meny: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Ljud" @@ -4144,29 +4310,29 @@ msgstr "skala" -#: ../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 "Den geografiska longituden vid muspekaren." -#: ../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 "Namnet på objektet vid muspekaren." -#: ../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 "Den geografiska latituden vid muspekaren." -#: ../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 "Vinkeln mellan föregående och pågående delsträcka." -#: ../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 "Kompassriktning för den delsträcka som ritas." -#: ../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 "Längden hos den nya delsträcka som håller på att ritas." -#: ../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 " @@ -4174,9 +4340,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(inget objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "" @@ -4282,5 +4448,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" @@ -4289,5 +4455,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" @@ -4296,5 +4462,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" @@ -4313,5 +4479,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 @@ -4328,5 +4494,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" @@ -4398,22 +4564,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." @@ -4492,6 +4658,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 "" @@ -4560,6 +4725,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" @@ -4567,6 +4732,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" @@ -4623,6 +4788,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 "" @@ -4657,7 +4822,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 "" @@ -4803,5 +4968,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 "" @@ -4936,5 +5101,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 "" @@ -5034,7 +5199,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" @@ -5044,6 +5209,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" @@ -5077,7 +5242,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 "" @@ -5166,5 +5329,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 @@ -5205,6 +5368,5 @@ msgid "" "Set the selected elements on the map to the selected items in the list above." -msgstr "" -"Sätt urval av element på kartan till de valda posterna i listan ovan." +msgstr "Sätt urval av element på kartan till de valda posterna i listan ovan." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 @@ -5231,10 +5393,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 "" @@ -5309,18 +5470,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 "Historik" -#: ../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 "Visa historik för alla valda poster." -#: ../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 @@ -5330,13 +5491,13 @@ msgstr "Uppdatera" -#: ../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 "Läs om alla de nu valda objekten och uppdatera listan." -#: ../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 "" @@ -5529,5 +5690,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 "" @@ -5570,25 +5731,25 @@ msgstr "Zooma till urval" -#: ../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 "Urval: Rel.:{0}/Sträckor:{1}/Noder:{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 "Markering" -#: ../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 "Urval: {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 "Lossa panelen" -#: ../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." @@ -5597,5 +5758,5 @@ "vänstra verktygraden." -#: ../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 "Klicka för att minimera/maximera panelens innehåll" @@ -5655,37 +5816,37 @@ msgstr "# objekt" -#: ../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 "Datakonflikter" -#: ../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 "" @@ -5694,63 +5855,91 @@ 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] "Hämta alla ofullständiga sträckor och noder i relationen" +msgstr[1] "Hämta alla ofullständiga sträckor och noder i relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Hämta plats" + +#: ../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 "Tillämpa snabbval" + +#: ../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 "Öppna en redigerare för den valda relationen" + +#: ../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 "" @@ -5760,15 +5949,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 " @@ -5776,5 +5965,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 " @@ -5782,20 +5971,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 "" @@ -5804,66 +5993,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 "Sport" + +#: ../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 "Flytta vald medlem/valda medlemmar uppåt" #. 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 "Flytta vald medlem/valda medlemmar nedåt" #. 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 " @@ -5872,53 +6065,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 "Hämta alla ofullständiga sträckor och noder i relationen" -#: ../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 "Hämta medlemmar" -#: ../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 "" @@ -5928,41 +6127,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 "" @@ -6002,19 +6194,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 "Verkställ ändringar" -#: ../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}''" @@ -6026,6 +6218,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 "" @@ -6184,6 +6375,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218 msgid "Download area too large; will probably be rejected by server" -msgstr "" -"Hämtningsområdet är alltför stort; kommer troligen avvisas av servern." +msgstr "Hämtningsområdet är alltför stort; kommer troligen avvisas av servern." #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:221 @@ -6207,7 +6397,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 "" @@ -6980,5 +7169,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 @@ -7215,6 +7404,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 "" @@ -7224,6 +7413,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 "" @@ -7486,13 +7675,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}" @@ -7593,6 +7782,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 "" @@ -7677,6 +7865,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] "" @@ -7690,6 +7878,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 " @@ -7744,5 +7932,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 " @@ -7750,5 +7938,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 "" @@ -7821,40 +8009,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 "Inställningar" -#: ../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 "Nya objekt:" -#: ../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 "Ändrade objekt:" -#: ../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 "Borttagna objekt:" -#: ../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:" @@ -7863,5 +8051,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:" @@ -7870,5 +8058,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:" @@ -7877,68 +8065,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 "Skicka in ändringar" -#: ../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 "Ange först önskade koordinater." + +#: ../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 "Ge en kort kommentar till de ändringar som du skickar in:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../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}" @@ -7946,16 +8133,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}." @@ -7963,6 +8150,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 "" @@ -7971,5 +8158,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 "" @@ -7999,111 +8186,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "Bilder för {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "Läs in GPX..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Tid saknas för punkt {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 "Kan inte lästa tidpunkt \"{0}\" från punkt {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 "Läser {0}..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Inga bilder med läsbara tidsangivelser hittades." - -#: ../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 "Geotaggade bilder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "GPS startpunkt: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "GPS slutpunkt: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "nuvarande delta: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "tidsskillnad: " - -#: ../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] "bild" -msgstr[1] "bilder" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} inom spåret." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Synka klocka" - -#: ../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 "JPEG-bilder (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "Datum i fil \"{0}\" kunde inte tolkas." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Bild" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "Tidszon för GPS-enhet (skillnad mot foto)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "Synkronisera Tid med GPS-enheten" - -#: ../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 "Angiven tid kunde inte tolkas." - -#: ../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} meter" +msgstr[1] "{0} meter" + +#: ../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 "Ange ett användarnamn" + +#: ../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 @@ -8111,30 +8242,30 @@ msgstr "gps-punkt" -#: ../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 "Anpassa linjeritning" -#: ../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 "Använd globala inställningar" -#: ../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 "Rita linjer mellan punkter i detta lager." -#: ../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 "Rita inte linjer mellan punkter i detta lager." -#: ../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 "Välj alternativ för linjeritning" -#: ../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 @@ -8142,5 +8273,5 @@ msgstr "Anpassa färger" -#: ../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 @@ -8149,5 +8280,5 @@ msgstr "Standard" -#: ../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 @@ -8156,58 +8287,63 @@ msgstr "Välj en färg" -#: ../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 "Markörer från namngivna punkter" -#: ../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 "Namngivna spårpunkter från {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215 msgid "Import Audio" msgstr "Importera ljud" -#: ../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 "Wave-ljudfiler (*.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 "Ljudmarkörer från {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 "Importera bilder" -#: ../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 "JPEG-bilder (*.jpg)" + +#: ../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 "Namn: {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 @@ -8215,5 +8351,5 @@ msgstr "Beskrivning: {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" @@ -8223,5 +8359,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 @@ -8229,22 +8365,17 @@ msgstr "Beskrivning" -#: ../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 "URL" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443 msgid "Length: " msgstr "Längd: " -#: ../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, " @@ -8253,5 +8384,5 @@ msgstr[1] "{0} rutter, " -#: ../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" @@ -8260,24 +8391,24 @@ msgstr[1] "{0} sträckpunkter" -#: ../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 "Omvandla till datalager" -#: ../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:" +#: ../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 "" "Det anses skadligt att skicka in obehandlad GPS-data.
Om du vill " "skicka in spår, se här:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8287,29 +8418,29 @@ msgstr "Omvandlad från:{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 "Hämta från OSM längs med detta spår" -#: ../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 "Hämta allting inom:" -#: ../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} meter" -#: ../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 "Största tillåtna område per begäran:" -#: ../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} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8320,9 +8451,9 @@ "Önskar du
fortsätta?" -#: ../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 "Det finns inte något GPX-spår i lagret att knyta ljudet till." -#: ../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 " @@ -8332,5 +8463,5 @@ "än dess slut uteslöts eller flyttades till början." -#: ../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 " @@ -8340,23 +8471,23 @@ "kunna uppskattas med någon rimlighet uteslöts." -#: ../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 "Datalager {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 "utanför hämtat område" -#: ../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." @@ -8365,5 +8496,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 "" @@ -8377,5 +8508,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 "" @@ -8388,11 +8519,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" @@ -8401,32 +8532,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} består av:" -#: ../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 "Omvandla till gpx-lager" -#: ../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 "" @@ -8434,6 +8565,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 "" @@ -8472,4 +8603,359 @@ msgstr[1] "{0} punkter" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "GPX-filer" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "Filen {0} är fortfarande aktiv under namnet \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#, java-format +msgid "Error while parsing {0}" +msgstr "Fel vid tolkning {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Kunde inte öppna \"{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 "" +"Ta ett foto av din GPS-mottagare när den visar tiden.
Visa detta " +"foto här.
Och därefter läs helt enkelt av den tid du läste på fotot och " +"välj en tidzon
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Fototid (från exif):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "Gps-tid (läst från fotot ovan): " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [dd/mm/yyyy hh:mm:ss]" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +msgid "I'm in the timezone of: " +msgstr "Jag är i följande tidzon: " + +#: ../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 "Inget datum" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "Öppna ett annat foto" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +msgid "Synchronize time from a photo of the GPS receiver" +msgstr "Synkronisera tid med hjälp av ett foto av GPS-mottagaren" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"Fel vid tolkning av daturm.\n" +"Använd begärt format" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "Ogiltigt datum" + +#: ../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 "GPX-spår: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Öppna ett annat foto" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +msgid "Timezone: " +msgstr "Tidszon: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +msgid "Offset:" +msgstr "Förskjutning:" + +#: ../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 "" +"Jag kan ta en bild av min GPS-mottagare.
Kan detta vara till nytta?" +"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 +msgid "Update position for: " +msgstr "Uppdatera position för: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 +msgid "All images" +msgstr "Alla bilder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 +msgid "Images with no exif position" +msgstr "Bilder utan positionsangivelse i exif" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 +msgid "Not yet tagged images" +msgstr "Bilder som inte taggats ännu" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +msgid "Correlate images with GPX track" +msgstr "Sätt bilder i relation till GPX-spår" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Correlate" +msgstr "Korrelera" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578 +msgid "Auto-Guess" +msgstr "Auto-gissa" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592 +msgid "You should select a GPX track" +msgstr "Välj ett GPX-spår" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "Inget GPX-spår har valts" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Fel vid tolkning av tidszon.\n" +"Förväntat format: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +msgid "Invalid timezone" +msgstr "Ogiltig tidszon" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"Fel vid tolkning av förskjutning.\n" +"Förväntat format: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +msgid "Invalid offset" +msgstr "Ogiltig förskjutning" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659 +#, java-format +msgid "Found {0} matches of {1} in GPX track {2}" +msgstr "Hittade {0} träffar för {1} i GPX-spår {2}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "GPX-spår har hämtats" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695 +msgid "The selected photos don't contain time information." +msgstr "De markerade fotografierna innehåller ingen tidsinformation." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696 +msgid "Photos don't contain time information" +msgstr "Fotografierna innehåller ingen tidsinformation." + +#: ../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 "" +"Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "GPX-spåret saknar tidsinformation" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "Tidszon: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "Minuter: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "Sekunder: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "Parade ihop {0} av {1} foton med GPX-spåret" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "(Tidsdifferens om {0} dagar)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "Förskjutning mellan spår och foton: {0}m {1}s" + +#: ../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 "Matchning av fotografier mot spår misslyckades" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885 +msgid "Adjust timezone and offset" +msgstr "Justera tidszon och tidsförskjutning" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886 +msgid "Default Values" +msgstr "Standardinställningar" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123 +msgid "Extracting GPS locations from EXIF" +msgstr "Extraherar GPS-plats från EXIF" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +msgid "Starting directory scan" +msgstr "Påbörjar foldergenomläsning" + +#: ../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 "Läs in foton..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "Läser {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 "Läser igenom folder {0}" + +#: ../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 "Fel vid läsning av filer från folder {0}\n" + +#: ../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 "Geotaggade bilder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "Korrelerar med GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "bild" +msgstr[1] "bilder" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "{0} hittades med gps-taggar." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +msgid "No image" +msgstr "Ingen bild" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "Hämtar {0}" + +#: ../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 "Fel i fil {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "Visa geotaggade foton" + +#: ../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 "Föregående" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Ta bort foto från lagret" + +#: ../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 "Nästa" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "Centrera visning" + +#: ../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 "" +"\n" +"Höjd: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8638,6 +9124,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40 msgid "Explicit waypoints with time estimated from track position." -msgstr "" -"Explicita sträckpunkter med tid uppskattad från position längs spåret." +msgstr "Explicita sträckpunkter med tid uppskattad från position längs spåret." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41 @@ -8786,5 +9271,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 @@ -8982,6 +9467,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 "" "Rita riktningspilar med hjälp av tabelluppslagning istället för komplicerad " @@ -9025,6 +9509,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188 msgid "Allows to tune the track coloring for different average speeds." -msgstr "" -"Tillåter att spårets färg justeras efter olika genomsnittshastigheter." +msgstr "Tillåter att spårets färg justeras efter olika genomsnittshastigheter." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193 @@ -9047,6 +9530,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 "Använd antialiasing för att ge kartan ett jämnare utseende." @@ -9115,19 +9597,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 "Utseende och känsla" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Språk" + +#: ../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 "Förval (automatiskt satt)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Språk" - -#: ../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 @@ -9388,6 +9870,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 "" @@ -9452,6 +9934,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 "" "

Dessutom så aktiveras kortkommandon när händelser knyts till en menyknapp " @@ -9469,9 +9951,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 "" "

Du kommer att märka att urvalslistan för tangenter på nästa sida " @@ -9486,6 +9967,6 @@ "tangentbord, '.'/punkt på tyska eller svenska tangentbor,...) istället. Om " "du inte gör så kan krockar uppstå, eftersom det inte finns något sätt för " -"JOSM att veta att på ett amerikanskt tangentbord så är i själva verket " -"Ctrl+Shift+; och Ctrl+: samma sak...

" +"JOSM att veta att på ett amerikanskt tangentbord så är i själva verket Ctrl" +"+Shift+; och Ctrl+: samma sak...

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177 @@ -9514,6 +9995,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 "" "

Pseudomodifieraren 'disabled' avaktiverar kortkommandot när detta " @@ -9608,5 +10089,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 "Mer information om denna funktion" @@ -9693,5 +10174,5 @@ msgstr "Hämtar punkter {0} till {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 @@ -9699,5 +10180,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9819,14 +10300,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 @@ -9854,24 +10334,31 @@ 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] "Hämtar punkter {0} till {1}..." +msgstr[1] "Hämtar punkter {0} till {1}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9913,27 +10400,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 "" @@ -9941,66 +10428,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 "Stänger ändringssamling..." -#: ../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 "Förbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Skickar in..." -#: ../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}." @@ -10035,5 +10522,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}''." @@ -10060,5 +10547,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}." @@ -10066,5 +10553,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}" @@ -10077,5 +10564,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}''." @@ -10134,7 +10621,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 "" @@ -10162,6 +10649,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 "" @@ -10227,46 +10714,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 "" @@ -10274,19 +10760,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 "Ofullständig -specifikation med ref=0" -#: ../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 "Ogiltigt objekt med 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 "" @@ -10296,8 +10782,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 "" @@ -10307,25 +10793,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 "" @@ -10333,5 +10819,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10340,5 +10826,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10346,5 +10832,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10353,13 +10839,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 "Förbereder OSM-data..." -#: ../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 "" @@ -10412,4 +10898,10 @@ msgid "Contacting Server..." msgstr "Tar kontakt med servern..." + +#: ../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 @@ -10448,42 +10940,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 "" @@ -10526,17 +11019,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 "Ta bort {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Fel vid borttagande av fil för insticksmodulen: {0}" + +#: ../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}." @@ -10548,19 +11051,18 @@ msgstr "Fel uppstod i insticksmodulen {0}" -#: ../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" @@ -10569,25 +11071,24 @@ 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 "" -"Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122 +msgstr "Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan." + #: ../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." @@ -10596,10 +11097,10 @@ "inte hittas." -#: ../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 "Insticksmodulen kunde ej hittas: {0}." -#: ../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?" @@ -10608,16 +11109,16 @@ "inställningarna?" -#: ../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 "Avaktivera insticksmodul" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Keep plugin" msgstr "Behåll plugin" -#: ../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 " @@ -10627,9 +11128,9 @@ "JOSM har behörighet att skriva över de existerande." -#: ../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 "" @@ -10638,10 +11139,10 @@ "Ett oväntat undantag inträffade som kan ha kommit från plugin:en ''{0}''." -#: ../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 "Enligt information inifrån insticksmodulen är dess upphovsman {0}." -#: ../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." @@ -10650,9 +11151,9 @@ "innan du rapporterar en bugg." -#: ../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 "Skall insticksmodulen avaktiveras?" -#: ../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 " @@ -10662,13 +11163,13 @@ "frigöra insticksmodulen." -#: ../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" @@ -10787,6 +11288,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 "" @@ -10824,6 +11325,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 "" "Uppladdning till servern misslyckades eftersom " @@ -10888,7 +11389,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 "" @@ -10900,7 +11400,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 "" @@ -10932,6 +11432,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 "" @@ -10984,6 +11484,6 @@ "\n" msgstr "" -"Det gick inte att tilldela kortkommandot ''{0}'' till handlingen ''{1}'' " -"({2})\n" +"Det gick inte att tilldela kortkommandot ''{0}'' till handlingen " +"''{1}'' ({2})\n" "eftersom detta kortkommando redan används för handlingen ''{3}'' ({4}).\n" "\n" @@ -11191,5 +11691,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" @@ -11204,12 +11704,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 "Udda" -#: ../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 @@ -11217,457 +11715,144 @@ msgstr "Jämna" -#: ../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 "Nummer" + +#. 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 "naturfenomen" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "bild" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "Uthyrning" + +#: ../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 "inre segment" + +#: ../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 "AgPifoJ - Geotaggade bilder" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "Visa geotaggade foton" - -#: ../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 "Föregående" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Ta bort foto från lagret" - -#: ../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 "Nästa" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "Centrera visning" - -#: ../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 "" -"\n" -"Höjd: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/h" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "Extraherar GPS-plats från EXIF" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121 -msgid "Starting directory scan" -msgstr "Påbörjar foldergenomläsning" - -#: ../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 "Läs in foton..." - -#: ../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 "Läser igenom folder {0}" - -#: ../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 "Fel vid läsning av filer från folder {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "Korrelerar med GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} hittades med gps-taggar." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "Öppna bilder med AgPifoJ..." - -#: ../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 "Hämta en uppsättning bilder som ett nytt lager." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "GPX-filer" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "Filen {0} är fortfarande aktiv under namnet \"{1}\"" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#, java-format -msgid "Error while parsing {0}" -msgstr "Fel vid tolkning {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Kunde inte öppna \"{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 "" -"Ta ett foto av din GPS-mottagare när den visar tiden.
Visa detta " -"foto här.
Och därefter läs helt enkelt av den tid du läste på fotot och " -"välj en tidzon
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Fototid (från exif):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "Gps-tid (läst från fotot ovan): " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [dd/mm/yyyy hh:mm:ss]" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 -msgid "I'm in the timezone of: " -msgstr "Jag är i följande tidzon: " - -#: ../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 "Inget datum" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "Öppna ett annat foto" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 -msgid "Synchronize time from a photo of the GPS receiver" -msgstr "Synkronisera tid med hjälp av ett foto av GPS-mottagaren" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"Fel vid tolkning av daturm.\n" -"Använd begärt format" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "Ogiltigt datum" - -#: ../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 "GPX-spår: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Öppna ett annat foto" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -msgid "Timezone: " -msgstr "Tidszon: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 -msgid "Offset:" -msgstr "Förskjutning:" - -#: ../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 "" -"Jag kan ta en bild av min GPS-mottagare.
Kan detta vara till " -"nytta?" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Uppdatera position för: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Alla bilder" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "Bilder utan positionsangivelse i exif" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "Bilder som inte taggats ännu" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 -msgid "Correlate images with GPX track" -msgstr "Sätt bilder i relation till GPX-spår" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Correlate" -msgstr "Korrelera" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -msgid "Auto-Guess" -msgstr "Auto-gissa" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592 -msgid "You should select a GPX track" -msgstr "Välj ett GPX-spår" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "Inget GPX-spår har valts" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Fel vid tolkning av tidszon.\n" -"Förväntat format: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Ogiltig tidszon" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"Fel vid tolkning av förskjutning.\n" -"Förväntat format: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Ogiltig förskjutning" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Hittade {0} träffar för {1} i GPX-spår {2}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX-spår har hämtats" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 -msgid "The selected photos don't contain time information." -msgstr "De markerade fotografierna innehåller ingen tidsinformation." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:696 -msgid "Photos don't contain time information" -msgstr "Fotografierna innehåller ingen tidsinformation." - -#: ../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 "" -"Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX-spåret saknar tidsinformation" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "Tidszon: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "Minuter: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "Sekunder: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "Parade ihop {0} av {1} foton med GPX-spåret" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "(Tidsdifferens om {0} dagar)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "Förskjutning mellan spår och foton: {0}m {1}s" - -#: ../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 "Matchning av fotografier mot spår misslyckades" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Adjust timezone and offset" -msgstr "Justera tidszon och tidsförskjutning" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 -msgid "Default Values" -msgstr "Standardinställningar" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433 -msgid "No image" -msgstr "Ingen bild" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "Hämtar {0}" - -#: ../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 "Fel i fil {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11811,11 +11996,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 "" @@ -12128,12 +12312,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] "Förenkla sträcka (ta bort {0} nod)" -msgstr[1] "Förenkla sträcka (ta bort {0} noder)" - #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 @@ -12247,14 +12423,14 @@ msgstr "Färgscheman" -#: ../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 " @@ -12464,6 +12640,6 @@ msgstr "" "Kan inte hämta biblioteket rxtxSerial. Om du behöver assistans med att " -"installera detta, så läs globalsats hemsida på http://www.raphael-" -"mack.de/josm-globalsat-gpx-import-plugin/" +"installera detta, så läs globalsats hemsida på http://www.raphael-mack.de/" +"josm-globalsat-gpx-import-plugin/" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 @@ -12565,4 +12741,8 @@ msgstr "Öppna bilder med ImageWayPoint" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Hämta en uppsättning bilder som ett nytt lager." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -12606,18 +12786,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 "Genomför hörnreduktion..." -#: ../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 "Utför Douglas-Peucker-approximation..." -#: ../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 "Tar bort dubblettnoder..." -#: ../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" @@ -12666,7 +12846,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12676,5 +12856,5 @@ #. 50000 #. -#. +#. #. #. @@ -12684,5 +12864,5 @@ #. 50000 #. -#. +#. #. #. @@ -12691,5 +12871,5 @@ #. 50000 #. -#. +#. #. #. @@ -12699,5 +12879,5 @@ #. 50000 #. -#. +#. #. #. @@ -12775,6 +12955,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 "" "Största antal delsträckor som tillåts i varje skapad sträcka. Förval 250." @@ -12798,7 +12977,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 "" "Noggrannhet för Douglas-Peuckers linjeförenkling, mätt i grader.
Lägre " @@ -12866,20 +13044,19 @@ msgstr "Kunde inte skaffa en bild" -#: ../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 "Ansluter" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Ansluten" -#. 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 "Inte ansluten" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "Anslutning misslyckades" @@ -13099,6 +13276,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 "" "Huvudet innehåller flera värden och kan inte mappas till en enda sträng" @@ -13182,9 +13358,10 @@ msgstr "Okänt filformat: {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 "Osmarender" -#: ../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 " @@ -13194,9 +13371,5 @@ "kartinställningssidan av inställningar." -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "inställningar för osmarender" - -#: ../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 "Firefox-applikationen" @@ -13228,6 +13401,5 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "A plugin that allows JOSM to be controlled from other applications." -msgstr "" -"En insticksmodul som låter JOSM kontrolleras från andra applikationer." +msgstr "En insticksmodul som låter JOSM kontrolleras från andra applikationer." #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 @@ -13578,17 +13750,17 @@ "Du måste först ange källor för snabbval för taggning i inställningarna." -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35 msgid "Reverse a terrace" msgstr "Vänd på husrad" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37 msgid "Reverses house numbers on a terrace." msgstr "Kastar om husnumrena i en husrad." -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39 msgid "Reverse a Terrace" msgstr "Vänd på husrad" -#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113 +#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110 msgid "Reverse Terrace" msgstr "Vänd husrad" @@ -13632,171 +13804,4 @@ msgid "Optional" msgstr "Valfri" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Join overlapping Areas" -msgstr "Förena överlappande ytor" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 -msgid "Joins areas that overlap each other" -msgstr "Förena ytor som överlappar varandra" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127 -msgid "Only up to two areas can be joined at the moment." -msgstr "För närvarande kan enbart upp till två ytor förenas." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132 -#, java-format -msgid "\"{0}\" is not closed and therefore can't be joined." -msgstr "\"{0}\" är inte sluten, och kan därför inte förenas med andra ytor." - -#: ../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 "" -"Den eller de valda sträckorna har noder som ligger utanför det område för " -"vilket data har hämtats.\n" -"Detta kan leda till att noder oavsiktligt tas bort.\n" -"Är du säker på att du vill fortsätta?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 -msgid "Please abort if you are not sure" -msgstr "Avbryt om du är osäker" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 -msgid "Please select at least one closed way the should be joined." -msgstr "Välj åtminstone en sluten väg som skall förenas." - -#: ../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 "La till nod vid alla korsande sträckor" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221 -msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "Ta bort sträckor som inte är del av en inre multipolygon" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226 -msgid "Fix relations" -msgstr "Korrigera relationer" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 -msgid "Joined self-overlapping area" -msgstr "Slog ihop område som låg ovanpå sig själv" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232 -msgid "Joined overlapping areas" -msgstr "Slog ihop områden som låg ovanpå varandra" - -#: ../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 "" -"Några av sträckorna var medlemmar i relationer som har ändrats. Kontrollera " -"att det inte har uppstått några fel." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 -msgid "Enter values for all conflicts." -msgstr "Ange värden för alla konflikter" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Jämka konflikter" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312 -msgid "Fix tag conflicts" -msgstr "Korrigera taggkonflikter" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462 -msgid "Removed Element from Relations" -msgstr "Tog bort element från relation" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571 -msgid "Join Areas: Remove Short Ways" -msgstr "Slå ihop områden: Ta bort korta sträckor" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587 -msgid "Closed Way" -msgstr "Sluten sträcka" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854 -msgid "Remove tags from inner ways" -msgstr "Ta bort taggar från inre sträckor" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883 -msgid "Join Areas Function" -msgstr "" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Jump To Position" -msgstr "Gå till plats" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30 -msgid "Opens a dialog that allows to jump to a specific location" -msgstr "" -"Öppnar en dialogruta som gör att man kan gå direkt till en viss plats" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 -msgid "Enter Lat/Lon to jump to position." -msgstr "Ange lat/lon för att gå direkt till plats." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 -msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "Du kan också klistra in en URL från www.openstreetmap.org" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 -msgid "Zoom (in metres)" -msgstr "Zoomnivå (meter)" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -msgid "Jump there" -msgstr "Gå direkt dit" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 -msgid "Jump to Position" -msgstr "Gå direkt till plats" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Could not parse Latitude, Longitude or Zoom. Please check." -msgstr "" -"Kunde inte tolka latitude, longitude eller zoomnivå. Kontrollera värdena." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 -msgid "Unable to parse Lon/Lat" -msgstr "Kunde inte tolka lon/lat" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Simplify Way" -msgstr "Förenkla sträcka" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Ta bort onödiga noder från en sträcka." - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "Välj åtminstone en sträcka att förenkla." - -#: ../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] "" -"Urvalet innehåller {0} sträcka. Är du säker på att du vill förenkla den?" -msgstr[1] "" -"Urvalet innehåller {0} sträckor. Är du säker på att du vill förenkla dem " -"alla?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "Är du säker?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13896,5 +13901,5 @@ msgstr "andra typer av validering" -#: ../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}" @@ -13947,34 +13952,34 @@ msgstr "Ignorera de valda felen nästa gång." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Hela gruppen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Enstaka poster" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Ingenting" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Ignorera hela gruppen eller enstaka poster?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 msgid "Ignoring elements" msgstr "Ignorerar poster" -#: ../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 "" @@ -14023,19 +14028,19 @@ msgstr "Korsande sträckor" -#: ../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 "Dubbletter av noder" -#: ../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 "" "Detta test kontrollerar att det inte finns några noder med precis samma läge." -#: ../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 "" @@ -14260,6 +14265,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:608 msgid "Validate property values and tags using complex rules." -msgstr "" -"Validera egenskapsvärden och taggar med hjälp av komplicerade regler." +msgstr "Validera egenskapsvärden och taggar med hjälp av komplicerade regler." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:629 @@ -14273,7 +14277,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 "" "De källor (URL eller filnamn) som används för att stavningskontrollera (läs " @@ -14421,5 +14424,5 @@ #. 50000 #. -#. +#. #. #. @@ -14427,5 +14430,5 @@ #. #. -#. +#. #. #. @@ -14435,5 +14438,5 @@ #. 50000 #. -#. +#. #. #. @@ -14442,5 +14445,5 @@ #. 50000 #. -#. +#. #. #. @@ -14449,5 +14452,5 @@ #. 50000 #. -#. +#. #. #. @@ -14456,5 +14459,5 @@ #. 50000 #. -#. +#. #. #. @@ -14463,5 +14466,5 @@ #. 50000 #. -#. +#. #. #. @@ -14470,9 +14473,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14517,5 +14520,5 @@ #. 50000 #. -#. +#. #. #. @@ -14656,14 +14659,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 " @@ -14672,14 +14675,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 "" @@ -14688,5 +14691,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 "" @@ -14698,13 +14701,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." @@ -14858,50 +14861,50 @@ msgstr "Den begärda ytan är för stor. Zooma in lite eller ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "Hämta de rutor som syns" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "Ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Reload erroneous tiles" msgstr "Läs om felaktiga rutor" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 msgid "Alpha channel" msgstr "Alfakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:369 msgid "Save WMS layer to file" msgstr "Spara WMS-lagret till en fil" -#: ../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 "Hämta WMS-lager från en fil" -#: ../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 "WMS-filversion som ej stöds; funnen {0}, förväntad {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "File Format Error" msgstr "Fel filformat" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "Fel vid läsning av fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -14978,5 +14981,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 "" @@ -15016,23 +15019,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 "" -"\"Another geotag plugin\" (Ytterligare ett geotag-plugin) för JOSM. " -"Korrelerar bilder med GPS-spår eller importerar EXIF-geotaggade bilder." - -#. 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 " @@ -15044,21 +15040,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 " @@ -15067,10 +15063,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 " @@ -15079,21 +15075,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 " @@ -15103,16 +15098,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 " @@ -15122,10 +15117,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 " @@ -15134,5 +15129,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 " @@ -15142,27 +15137,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 " @@ -15171,15 +15166,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 +msgid "Let other applications send commands to JOSM." +msgstr "" + +#. Plugin routes #: build/trans_plugins.java:55 -msgid "Let other applications send commands to JOSM." -msgstr "" - -#. Plugin routes -#: build/trans_plugins.java:57 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15188,10 +15183,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 " @@ -15200,15 +15195,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 " @@ -15218,17 +15213,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 " @@ -15237,5 +15225,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15244,10 +15232,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, ...)." @@ -16300,8 +16288,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16498,5 +16486,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16506,5 +16494,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16523,5 +16511,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16531,5 +16519,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16548,5 +16536,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16556,5 +16544,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16573,5 +16561,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16581,5 +16569,5 @@ #. 300000 #. -#. +#. #. #. @@ -16594,5 +16582,5 @@ #. 300000 #. -#. +#. #. #. @@ -16610,5 +16598,5 @@ #. 50000 #. -#. +#. #. #. @@ -16626,5 +16614,5 @@ #. 40000 #. -#. +#. #. #. @@ -16633,5 +16621,5 @@ #. 40000 #. -#. +#. #. #. @@ -16641,5 +16629,5 @@ #. 50000 #. -#. +#. #. #. @@ -16659,5 +16647,5 @@ #. 50000 #. -#. +#. #. #. @@ -16666,5 +16654,5 @@ #. 50000 #. -#. +#. #. #. @@ -16674,5 +16662,5 @@ #. 50000 #. -#. +#. #. #. @@ -16722,7 +16710,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17421,5 +17409,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17458,5 +17446,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17552,5 +17540,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17707,5 +17695,5 @@ #. 50000 #. -#. +#. #. #. @@ -19092,5 +19080,5 @@ #. 30000 #. -#. +#. #. #. @@ -19100,5 +19088,5 @@ #. 40000 #. -#. +#. #. #. @@ -19108,5 +19096,5 @@ #. 20000 #. -#. +#. #. #. @@ -19116,5 +19104,5 @@ #. 40000 #. -#. +#. #. #. @@ -19472,7 +19460,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19482,5 +19470,5 @@ #. 50000 #. -#. +#. #. #. @@ -19490,5 +19478,5 @@ #. 50000 #. -#. +#. #. #. @@ -19498,5 +19486,5 @@ #. 50000 #. -#. +#. #. #. @@ -19506,5 +19494,5 @@ #. 50000 #. -#. +#. #. #. @@ -19514,5 +19502,5 @@ #. 50000 #. -#. +#. #. #. @@ -19522,5 +19510,5 @@ #. 50000 #. -#. +#. #. #. @@ -19530,5 +19518,5 @@ #. 50000 #. -#. +#. #. #. @@ -19538,5 +19526,5 @@ #. 50000 #. -#. +#. #. #. @@ -19546,5 +19534,5 @@ #. 50000 #. -#. +#. #. #. @@ -19554,5 +19542,5 @@ #. 50000 #. -#. +#. #. #. @@ -19562,5 +19550,5 @@ #. 50000 #. -#. +#. #. #. @@ -19570,5 +19558,5 @@ #. 50000 #. -#. +#. #. #. @@ -19578,5 +19566,5 @@ #. 50000 #. -#. +#. #. #. @@ -19586,5 +19574,5 @@ #. 50000 #. -#. +#. #. #. @@ -19594,5 +19582,5 @@ #. 50000 #. -#. +#. #. #. @@ -19602,5 +19590,5 @@ #. 50000 #. -#. +#. #. #. @@ -19610,5 +19598,5 @@ #. 50000 #. -#. +#. #. #. @@ -19618,5 +19606,5 @@ #. 50000 #. -#. +#. #. #. @@ -19626,5 +19614,5 @@ #. 50000 #. -#. +#. #. #. @@ -19634,5 +19622,5 @@ #. 50000 #. -#. +#. #. #. @@ -19642,5 +19630,5 @@ #. 50000 #. -#. +#. #. #. @@ -19650,5 +19638,5 @@ #. 50000 #. -#. +#. #. #. @@ -19658,5 +19646,5 @@ #. 50000 #. -#. +#. #. #. @@ -19666,5 +19654,5 @@ #. 50000 #. -#. +#. #. #. @@ -19674,5 +19662,5 @@ #. 50000 #. -#. +#. #. #. @@ -19682,5 +19670,5 @@ #. 50000 #. -#. +#. #. #. @@ -19690,5 +19678,5 @@ #. 50000 #. -#. +#. #. #. @@ -19698,5 +19686,5 @@ #. 50000 #. -#. +#. #. #. @@ -19706,5 +19694,5 @@ #. 50000 #. -#. +#. #. #. @@ -19714,5 +19702,5 @@ #. 50000 #. -#. +#. #. #. @@ -19722,5 +19710,5 @@ #. 50000 #. -#. +#. #. #. @@ -19730,5 +19718,5 @@ #. 50000 #. -#. +#. #. #. @@ -19738,5 +19726,5 @@ #. 50000 #. -#. +#. #. #. @@ -19746,5 +19734,5 @@ #. 50000 #. -#. +#. #. #. @@ -19754,5 +19742,5 @@ #. 50000 #. -#. +#. #. #. @@ -19762,5 +19750,5 @@ #. 50000 #. -#. +#. #. #. @@ -19770,5 +19758,5 @@ #. 50000 #. -#. +#. #. #. @@ -19778,5 +19766,5 @@ #. 50000 #. -#. +#. #. #. @@ -19786,5 +19774,5 @@ #. 50000 #. -#. +#. #. #. @@ -19794,5 +19782,5 @@ #. 50000 #. -#. +#. #. #. @@ -19802,5 +19790,5 @@ #. 50000 #. -#. +#. #. #. @@ -19810,5 +19798,5 @@ #. 50000 #. -#. +#. #. #. @@ -19818,5 +19806,5 @@ #. 50000 #. -#. +#. #. #. @@ -19826,5 +19814,5 @@ #. 50000 #. -#. +#. #. #. @@ -19834,5 +19822,5 @@ #. 50000 #. -#. +#. #. #. @@ -19842,5 +19830,5 @@ #. 50000 #. -#. +#. #. #. @@ -21534,7 +21522,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21544,5 +21532,5 @@ #. 50000 #. -#. +#. #. #. @@ -21552,5 +21540,5 @@ #. 50000 #. -#. +#. #. #. @@ -21560,5 +21548,5 @@ #. 50000 #. -#. +#. #. #. @@ -21568,5 +21556,5 @@ #. 50000 #. -#. +#. #. #. @@ -21576,5 +21564,5 @@ #. 50000 #. -#. +#. #. #. @@ -21584,5 +21572,5 @@ #. 50000 #. -#. +#. #. #. @@ -21592,5 +21580,5 @@ #. 50000 #. -#. +#. #. #. @@ -22921,5 +22909,5 @@ #. 40000 #. -#. +#. #. #. @@ -22935,5 +22923,5 @@ #. 30000 #. -#. +#. #. #. @@ -22944,7 +22932,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22954,5 +22942,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22962,13 +22958,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22978,5 +22966,5 @@ #. 50000 #. -#. +#. #. #. @@ -23009,5 +22997,5 @@ #. 50000 #. -#. +#. #. #. @@ -23023,5 +23011,5 @@ #. 50000 #. -#. +#. #. #. @@ -23031,5 +23019,5 @@ #. 10000 #. -#. +#. #. #. @@ -23039,5 +23027,5 @@ #. 10000 #. -#. +#. #. #. @@ -23048,5 +23036,5 @@ #. 10000 #. -#. +#. #. #. @@ -23075,5 +23063,5 @@ #. 50000 #. -#. +#. #. #. @@ -23188,9 +23176,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 @@ -23198,5 +23186,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, @@ -23206,8 +23194,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 @@ -23221,5 +23209,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23227,5 +23215,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23274,6 +23262,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23353,5 +23341,5 @@ #. 40000 #. -#. +#. #. #. @@ -23361,5 +23349,5 @@ #. 10000 #. -#. +#. #. #. @@ -23368,5 +23356,5 @@ #. 50000 #. -#. +#. #. #. @@ -23376,5 +23364,5 @@ #. 50000 #. -#. +#. #. #. @@ -23383,5 +23371,5 @@ #. 50000 #. -#. +#. #. #. @@ -23390,5 +23378,5 @@ #. 50000 #. -#. +#. #. #. @@ -23397,5 +23385,5 @@ #. 50000 #. -#. +#. #. #. @@ -23404,5 +23392,5 @@ #. 50000 #. -#. +#. #. #. @@ -23411,5 +23399,5 @@ #. 40000 #. -#. +#. #. #. @@ -23418,5 +23406,5 @@ #. 50000 #. -#. +#. #. #. @@ -23425,5 +23413,5 @@ #. 50000 #. -#. +#. #. #. @@ -23432,5 +23420,5 @@ #. 50000 #. -#. +#. #. #. @@ -23439,5 +23427,5 @@ #. 50000 #. -#. +#. #. #. @@ -23446,5 +23434,5 @@ #. 50000 #. -#. +#. #. #. @@ -23453,5 +23441,5 @@ #. 50000 #. -#. +#. #. #. @@ -23461,5 +23449,5 @@ #. 50000 #. -#. +#. #. #. @@ -23468,5 +23456,5 @@ #. 50000 #. -#. +#. #. #. @@ -23477,5 +23465,5 @@ #. 50000 #. -#. +#. #. #. @@ -23487,11 +23475,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23500,7 +23488,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23511,5 +23499,5 @@ #. 50000 #. -#. +#. #. #. @@ -23520,5 +23508,5 @@ #. 50000 #. -#. +#. #. #. @@ -23529,5 +23517,5 @@ #. 50000 #. -#. +#. #. #. @@ -23538,5 +23526,5 @@ #. 50000 #. -#. +#. #. #. @@ -23547,5 +23535,5 @@ #. 50000 #. -#. +#. #. #. @@ -23556,5 +23544,5 @@ #. 40000 #. -#. +#. #. #. @@ -23566,5 +23554,5 @@ #. 50000 #. -#. +#. #. #. @@ -23575,5 +23563,5 @@ #. 50000 #. -#. +#. #. #. @@ -23598,5 +23586,5 @@ #. 10000 #. -#. +#. #. #. @@ -23605,5 +23593,5 @@ #. 50000 #. -#. +#. #. #. @@ -23612,5 +23600,5 @@ #. 50000 #. -#. +#. #. #. @@ -23626,5 +23614,5 @@ #. 20000 #. -#. +#. #. #. @@ -23638,5 +23626,5 @@ #. 30000 #. -#. +#. #. #. @@ -23645,5 +23633,5 @@ #. 50000 #. -#. +#. #. #. @@ -23652,5 +23640,5 @@ #. 50000 #. -#. +#. #. #. @@ -23659,5 +23647,5 @@ #. 50000 #. -#. +#. #. #. @@ -23666,5 +23654,5 @@ #. 50000 #. -#. +#. #. #. @@ -23673,5 +23661,5 @@ #. 50000 #. -#. +#. #. #. @@ -23680,5 +23668,5 @@ #. 50000 #. -#. +#. #. #. @@ -23687,5 +23675,5 @@ #. 50000 #. -#. +#. #. #. @@ -23694,5 +23682,5 @@ #. 50000 #. -#. +#. #. #. @@ -23701,5 +23689,5 @@ #. 50000 #. -#. +#. #. #. @@ -23708,5 +23696,5 @@ #. 50000 #. -#. +#. #. #. @@ -23715,5 +23703,5 @@ #. 50000 #. -#. +#. #. #. @@ -23722,5 +23710,5 @@ #. 50000 #. -#. +#. #. #. @@ -23729,5 +23717,5 @@ #. 50000 #. -#. +#. #. #. @@ -23736,5 +23724,5 @@ #. 50000 #. -#. +#. #. #. @@ -23905,7 +23893,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23919,5 +23907,5 @@ #. 40000 #. -#. +#. #. #. @@ -23927,7 +23915,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23937,5 +23925,5 @@ #. 50000 #. -#. +#. #. #. @@ -23945,5 +23933,5 @@ #. 50000 #. -#. +#. #. #. @@ -23953,5 +23941,5 @@ #. 50000 #. -#. +#. #. #. @@ -23961,5 +23949,5 @@ #. 50000 #. -#. +#. #. #. @@ -23975,5 +23963,5 @@ #. 10000 #. -#. +#. #. #. @@ -23983,5 +23971,5 @@ #. 50000 #. -#. +#. #. #. @@ -23991,5 +23979,5 @@ #. 50000 #. -#. +#. #. #. @@ -23999,5 +23987,5 @@ #. 50000 #. -#. +#. #. #. @@ -24007,5 +23995,5 @@ #. 50000 #. -#. +#. #. #. @@ -24015,5 +24003,5 @@ #. 50000 #. -#. +#. #. #. @@ -24023,5 +24011,5 @@ #. 50000 #. -#. +#. #. #. @@ -24040,5 +24028,5 @@ #. 50000 #. -#. +#. #. #. @@ -24047,5 +24035,5 @@ #. 50000 #. -#. +#. #. #. @@ -24059,5 +24047,5 @@ #. 50000 #. -#. +#. #. #. @@ -24071,5 +24059,5 @@ #. 50000 #. -#. +#. #. #. @@ -24078,5 +24066,5 @@ #. 50000 #. -#. +#. #. #. @@ -24090,5 +24078,5 @@ #. 50000 #. -#. +#. #. #. @@ -24103,5 +24091,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24116,5 +24104,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24128,5 +24116,5 @@ #. 50000 #. -#. +#. #. #. @@ -24140,5 +24128,5 @@ #. 50000 #. -#. +#. #. #. @@ -24147,5 +24135,5 @@ #. 50000 #. -#. +#. #. #. @@ -24154,5 +24142,5 @@ #. 50000 #. -#. +#. #. #. @@ -24166,5 +24154,5 @@ #. 50000 #. -#. +#. #. #. @@ -24174,5 +24162,5 @@ #. 50000 #. -#. +#. #. #. @@ -24181,5 +24169,5 @@ #. 50000 #. -#. +#. #. #. @@ -24188,5 +24176,5 @@ #. 50000 #. -#. +#. #. #. @@ -24195,5 +24183,5 @@ #. 50000 #. -#. +#. #. #. @@ -24203,5 +24191,5 @@ #. 50000 #. -#. +#. #. #. @@ -24212,5 +24200,5 @@ #. 50000 #. -#. +#. #. #. @@ -24220,7 +24208,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24230,5 +24218,5 @@ #. 50000 #. -#. +#. #. #. @@ -24238,5 +24226,5 @@ #. 50000 #. -#. +#. #. #. @@ -24246,5 +24234,5 @@ #. 50000 #. -#. +#. #. #. @@ -24255,5 +24243,5 @@ #. 50000 #. -#. +#. #. #. @@ -24263,5 +24251,5 @@ #. 50000 #. -#. +#. #. #. @@ -24271,5 +24259,5 @@ #. 50000 #. -#. +#. #. #. @@ -24279,5 +24267,5 @@ #. 50000 #. -#. +#. #. #. @@ -24287,5 +24275,5 @@ #. 50000 #. -#. +#. #. #. @@ -24295,5 +24283,5 @@ #. 50000 #. -#. +#. #. #. @@ -24303,5 +24291,5 @@ #. 50000 #. -#. +#. #. #. @@ -24311,5 +24299,5 @@ #. 50000 #. -#. +#. #. #. @@ -24319,5 +24307,5 @@ #. 50000 #. -#. +#. #. #. @@ -24340,7 +24328,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24350,5 +24338,5 @@ #. 50000 #. -#. +#. #. #. @@ -24357,5 +24345,5 @@ #. 50000 #. -#. +#. #. #. @@ -24365,5 +24353,5 @@ #. 50000 #. -#. +#. #. #. @@ -24372,5 +24360,5 @@ #. 50000 #. -#. +#. #. #. @@ -24380,5 +24368,5 @@ #. 50000 #. -#. +#. #. #. @@ -24388,5 +24376,5 @@ #. 50000 #. -#. +#. #. #. @@ -24402,5 +24390,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24411,5 +24399,5 @@ #. 50000 #. -#. +#. #. #. @@ -24428,5 +24416,5 @@ #. 50000 #. -#. +#. #. #. @@ -24436,5 +24424,5 @@ #. 50000 #. -#. +#. #. #. @@ -24447,5 +24435,5 @@ #. 50000 #. -#. +#. #. #. @@ -24463,5 +24451,5 @@ #. 50000 #. -#. +#. #. #. @@ -24470,5 +24458,5 @@ #. 50000 #. -#. +#. #. #. @@ -24477,5 +24465,5 @@ #. 50000 #. -#. +#. #. #. @@ -24484,7 +24472,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24495,5 +24483,5 @@ #. 50000 #. -#. +#. #. #. @@ -24508,5 +24496,5 @@ #. 50000 #. -#. +#. #. #. @@ -24520,5 +24508,5 @@ #. 50000 #. -#. +#. #. #. @@ -24528,5 +24516,5 @@ #. 50000 #. -#. +#. #. #. @@ -24540,5 +24528,5 @@ #. 50000 #. -#. +#. #. #. @@ -24552,5 +24540,5 @@ #. 50000 #. -#. +#. #. #. @@ -24559,7 +24547,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24569,5 +24557,5 @@ #. 50000 #. -#. +#. #. #. @@ -24577,5 +24565,5 @@ #. 50000 #. -#. +#. #. #. @@ -24585,5 +24573,5 @@ #. 50000 #. -#. +#. #. #. @@ -24593,5 +24581,5 @@ #. 50000 #. -#. +#. #. #. @@ -24607,7 +24595,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24622,5 +24610,5 @@ #. 30000 #. -#. +#. #. #. @@ -24635,5 +24623,5 @@ #. 30000 #. -#. +#. #. #. @@ -24648,5 +24636,5 @@ #. 30000 #. -#. +#. #. #. @@ -24661,5 +24649,5 @@ #. 30000 #. -#. +#. #. #. @@ -24674,5 +24662,5 @@ #. 30000 #. -#. +#. #. #. @@ -24687,7 +24675,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24697,5 +24685,5 @@ #. 50000 #. -#. +#. #. #. @@ -24704,5 +24692,5 @@ #. 50000 #. -#. +#. #. #. @@ -24712,5 +24700,5 @@ #. 50000 #. -#. +#. #. #. @@ -24720,5 +24708,5 @@ #. 50000 #. -#. +#. #. #. @@ -24728,5 +24716,5 @@ #. 50000 #. -#. +#. #. #. @@ -24736,5 +24724,5 @@ #. 50000 #. -#. +#. #. #. @@ -24744,5 +24732,5 @@ #. 50000 #. -#. +#. #. #. @@ -24752,5 +24740,5 @@ #. 50000 #. -#. +#. #. #. @@ -24760,5 +24748,5 @@ #. 50000 #. -#. +#. #. #. @@ -24768,5 +24756,5 @@ #. 50000 #. -#. +#. #. #. @@ -24776,5 +24764,5 @@ #. 50000 #. -#. +#. #. #. @@ -24784,5 +24772,5 @@ #. 50000 #. -#. +#. #. #. @@ -24792,5 +24780,5 @@ #. 50000 #. -#. +#. #. #. @@ -24810,5 +24798,5 @@ #. 50000 #. -#. +#. #. #. @@ -24823,5 +24811,5 @@ #. 50000 #. -#. +#. #. #. @@ -24834,7 +24822,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24844,5 +24832,5 @@ #. 50000 #. -#. +#. #. #. @@ -24852,5 +24840,5 @@ #. 50000 #. -#. +#. #. #. @@ -24860,5 +24848,5 @@ #. 50000 #. -#. +#. #. #. @@ -24868,5 +24856,5 @@ #. 50000 #. -#. +#. #. #. @@ -24876,5 +24864,5 @@ #. 50000 #. -#. +#. #. #. @@ -24884,5 +24872,5 @@ #. 50000 #. -#. +#. #. #. @@ -24892,5 +24880,5 @@ #. 50000 #. -#. +#. #. #. @@ -24900,5 +24888,5 @@ #. 50000 #. -#. +#. #. #. @@ -24908,5 +24896,5 @@ #. 50000 #. -#. +#. #. #. @@ -24916,5 +24904,5 @@ #. 50000 #. -#. +#. #. #. @@ -24924,5 +24912,5 @@ #. 50000 #. -#. +#. #. #. @@ -24932,5 +24920,5 @@ #. 50000 #. -#. +#. #. #. @@ -24940,5 +24928,5 @@ #. 50000 #. -#. +#. #. #. @@ -24948,5 +24936,5 @@ #. 50000 #. -#. +#. #. #. @@ -24967,5 +24955,5 @@ #. 50000 #. -#. +#. #. #. @@ -24979,7 +24967,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24989,5 +24977,5 @@ #. 50000 #. -#. +#. #. #. @@ -24997,5 +24985,5 @@ #. 50000 #. -#. +#. #. #. @@ -25005,5 +24993,5 @@ #. 50000 #. -#. +#. #. #. @@ -25013,5 +25001,5 @@ #. 50000 #. -#. +#. #. #. @@ -25021,5 +25009,5 @@ #. 50000 #. -#. +#. #. #. @@ -25029,5 +25017,5 @@ #. 50000 #. -#. +#. #. #. @@ -25037,5 +25025,5 @@ #. 50000 #. -#. +#. #. #. @@ -25052,5 +25040,5 @@ #. 50000 #. -#. +#. #. #. @@ -25060,5 +25048,5 @@ #. 50000 #. -#. +#. #. #. @@ -25068,5 +25056,5 @@ #. 50000 #. -#. +#. #. #. @@ -25076,5 +25064,5 @@ #. 50000 #. -#. +#. #. #. @@ -25084,5 +25072,5 @@ #. 50000 #. -#. +#. #. #. @@ -25092,5 +25080,5 @@ #. 50000 #. -#. +#. #. #. @@ -25100,5 +25088,5 @@ #. 50000 #. -#. +#. #. #. @@ -25108,5 +25096,5 @@ #. 50000 #. -#. +#. #. #. @@ -25116,5 +25104,5 @@ #. 50000 #. -#. +#. #. #. @@ -25124,5 +25112,5 @@ #. 50000 #. -#. +#. #. #. @@ -25132,5 +25120,5 @@ #. 50000 #. -#. +#. #. #. @@ -25140,5 +25128,5 @@ #. 50000 #. -#. +#. #. #. @@ -25157,5 +25145,5 @@ #. 50000 #. -#. +#. #. #. @@ -25165,5 +25153,5 @@ #. 50000 #. -#. +#. #. #. @@ -25172,5 +25160,5 @@ #. 50000 #. -#. +#. #. #. @@ -25180,5 +25168,5 @@ #. 50000 #. -#. +#. #. #. @@ -25188,5 +25176,5 @@ #. 50000 #. -#. +#. #. #. @@ -25196,5 +25184,5 @@ #. 50000 #. -#. +#. #. #. @@ -25203,5 +25191,5 @@ #. 50000 #. -#. +#. #. #. @@ -25211,5 +25199,5 @@ #. 50000 #. -#. +#. #. #. @@ -25219,5 +25207,5 @@ #. 50000 #. -#. +#. #. #. @@ -25227,5 +25215,5 @@ #. 50000 #. -#. +#. #. #. @@ -25235,5 +25223,5 @@ #. 50000 #. -#. +#. #. #. @@ -25242,5 +25230,5 @@ #. 50000 #. -#. +#. #. #. @@ -25249,5 +25237,5 @@ #. 50000 #. -#. +#. #. #. @@ -25256,5 +25244,5 @@ #. 50000 #. -#. +#. #. #. @@ -25263,5 +25251,5 @@ #. 50000 #. -#. +#. #. #. @@ -25270,5 +25258,5 @@ #. 50000 #. -#. +#. #. #. @@ -25277,5 +25265,5 @@ #. 50000 #. -#. +#. #. #. @@ -25284,5 +25272,5 @@ #. 50000 #. -#. +#. #. #. @@ -25291,5 +25279,5 @@ #. 50000 #. -#. +#. #. #. @@ -25298,5 +25286,5 @@ #. 50000 #. -#. +#. #. #. @@ -25305,5 +25293,5 @@ #. 50000 #. -#. +#. #. #. @@ -25312,5 +25300,5 @@ #. 50000 #. -#. +#. #. #. @@ -25319,5 +25307,5 @@ #. 50000 #. -#. +#. #. #. @@ -25326,5 +25314,5 @@ #. 50000 #. -#. +#. #. #. @@ -25334,5 +25322,5 @@ #. 50000 #. -#. +#. #. #. @@ -25342,5 +25330,5 @@ #. 50000 #. -#. +#. #. #. @@ -25350,5 +25338,5 @@ #. 50000 #. -#. +#. #. #. @@ -25358,5 +25346,5 @@ #. 50000 #. -#. +#. #. #. @@ -25366,5 +25354,5 @@ #. 50000 #. -#. +#. #. #. @@ -25374,5 +25362,5 @@ #. 50000 #. -#. +#. #. #. @@ -25382,5 +25370,5 @@ #. 50000 #. -#. +#. #. #. @@ -25390,5 +25378,5 @@ #. 50000 #. -#. +#. #. #. @@ -25398,5 +25386,5 @@ #. 50000 #. -#. +#. #. #. @@ -25407,5 +25395,5 @@ #. 50000 #. -#. +#. #. #. @@ -25415,5 +25403,5 @@ #. 50000 #. -#. +#. #. #. @@ -25423,5 +25411,5 @@ #. 50000 #. -#. +#. #. #. @@ -25431,5 +25419,5 @@ #. 50000 #. -#. +#. #. #. @@ -25439,5 +25427,5 @@ #. 50000 #. -#. +#. #. #. @@ -25447,5 +25435,5 @@ #. 50000 #. -#. +#. #. #. @@ -25455,5 +25443,5 @@ #. 50000 #. -#. +#. #. #. @@ -25463,5 +25451,5 @@ #. 50000 #. -#. +#. #. #. @@ -25471,5 +25459,5 @@ #. 50000 #. -#. +#. #. #. @@ -25479,5 +25467,5 @@ #. 50000 #. -#. +#. #. #. @@ -25487,5 +25475,5 @@ #. 50000 #. -#. +#. #. #. @@ -25495,5 +25483,5 @@ #. 50000 #. -#. +#. #. #. @@ -25503,5 +25491,5 @@ #. 50000 #. -#. +#. #. #. @@ -25511,5 +25499,5 @@ #. 50000 #. -#. +#. #. #. @@ -25519,5 +25507,5 @@ #. 50000 #. -#. +#. #. #. @@ -25527,5 +25515,5 @@ #. 50000 #. -#. +#. #. #. @@ -25535,5 +25523,5 @@ #. 50000 #. -#. +#. #. #. @@ -25543,5 +25531,5 @@ #. 50000 #. -#. +#. #. #. @@ -25551,5 +25539,5 @@ #. 50000 #. -#. +#. #. #. @@ -25558,5 +25546,5 @@ #. 50000 #. -#. +#. #. #. @@ -25588,5 +25576,5 @@ #. 50000 #. -#. +#. #. #. @@ -25596,5 +25584,5 @@ #. 50000 #. -#. +#. #. #. @@ -25604,7 +25592,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25619,5 +25607,5 @@ #. 50000 #. -#. +#. #. #. @@ -25627,5 +25615,5 @@ #. 50000 #. -#. +#. #. #. @@ -25635,5 +25623,5 @@ #. 50000 #. -#. +#. #. #. @@ -25643,5 +25631,5 @@ #. 50000 #. -#. +#. #. #. @@ -25651,5 +25639,5 @@ #. 50000 #. -#. +#. #. #. @@ -25659,5 +25647,5 @@ #. 50000 #. -#. +#. #. #. @@ -25667,5 +25655,5 @@ #. 50000 #. -#. +#. #. #. @@ -25681,7 +25669,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25691,5 +25679,5 @@ #. 50000 #. -#. +#. #. #. @@ -25699,5 +25687,5 @@ #. 50000 #. -#. +#. #. #. @@ -25707,5 +25695,5 @@ #. 50000 #. -#. +#. #. #. @@ -25715,5 +25703,5 @@ #. 50000 #. -#. +#. #. #. @@ -25723,5 +25711,5 @@ #. 50000 #. -#. +#. #. #. @@ -25731,5 +25719,5 @@ #. 50000 #. -#. +#. #. #. @@ -25739,5 +25727,5 @@ #. 50000 #. -#. +#. #. #. @@ -25747,5 +25735,5 @@ #. 50000 #. -#. +#. #. #. @@ -25755,5 +25743,5 @@ #. 50000 #. -#. +#. #. #. @@ -25763,5 +25751,5 @@ #. 50000 #. -#. +#. #. #. @@ -25771,5 +25759,5 @@ #. 50000 #. -#. +#. #. #. @@ -25779,5 +25767,5 @@ #. 50000 #. -#. +#. #. #. @@ -25787,5 +25775,5 @@ #. 50000 #. -#. +#. #. #. @@ -25795,5 +25783,5 @@ #. 50000 #. -#. +#. #. #. @@ -25803,5 +25791,5 @@ #. 50000 #. -#. +#. #. #. @@ -25811,5 +25799,5 @@ #. 50000 #. -#. +#. #. #. @@ -25819,5 +25807,5 @@ #. 50000 #. -#. +#. #. #. @@ -25827,5 +25815,5 @@ #. 50000 #. -#. +#. #. #. @@ -25835,5 +25823,5 @@ #. 50000 #. -#. +#. #. #. @@ -25843,5 +25831,5 @@ #. 50000 #. -#. +#. #. #. @@ -25851,5 +25839,5 @@ #. 50000 #. -#. +#. #. #. @@ -25859,5 +25847,5 @@ #. 50000 #. -#. +#. #. #. @@ -25867,5 +25855,5 @@ #. 50000 #. -#. +#. #. #. @@ -25875,5 +25863,5 @@ #. 50000 #. -#. +#. #. #. @@ -25883,5 +25871,5 @@ #. 50000 #. -#. +#. #. #. @@ -25891,5 +25879,5 @@ #. 50000 #. -#. +#. #. #. @@ -25899,5 +25887,5 @@ #. 50000 #. -#. +#. #. #. @@ -25907,5 +25895,5 @@ #. 50000 #. -#. +#. #. #. @@ -25915,5 +25903,5 @@ #. 50000 #. -#. +#. #. #. @@ -25923,5 +25911,5 @@ #. 50000 #. -#. +#. #. #. @@ -25931,5 +25919,5 @@ #. 50000 #. -#. +#. #. #. @@ -25939,5 +25927,5 @@ #. 50000 #. -#. +#. #. #. @@ -25947,5 +25935,5 @@ #. 50000 #. -#. +#. #. #. @@ -25955,5 +25943,5 @@ #. 50000 #. -#. +#. #. #. @@ -25963,5 +25951,5 @@ #. 50000 #. -#. +#. #. #. @@ -25971,5 +25959,5 @@ #. 50000 #. -#. +#. #. #. @@ -25979,5 +25967,5 @@ #. 50000 #. -#. +#. #. #. @@ -25987,5 +25975,5 @@ #. 50000 #. -#. +#. #. #. @@ -25995,5 +25983,5 @@ #. 50000 #. -#. +#. #. #. @@ -26003,5 +25991,5 @@ #. 50000 #. -#. +#. #. #. @@ -26011,5 +25999,5 @@ #. 50000 #. -#. +#. #. #. @@ -26019,5 +26007,5 @@ #. 50000 #. -#. +#. #. #. @@ -26053,7 +26041,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26063,5 +26051,5 @@ #. 50000 #. -#. +#. #. #. @@ -26071,5 +26059,5 @@ #. 50000 #. -#. +#. #. #. @@ -26079,5 +26067,5 @@ #. 50000 #. -#. +#. #. #. @@ -26087,5 +26075,5 @@ #. 50000 #. -#. +#. #. #. @@ -26095,5 +26083,5 @@ #. 50000 #. -#. +#. #. #. @@ -26103,5 +26091,5 @@ #. 50000 #. -#. +#. #. #. @@ -26111,5 +26099,5 @@ #. 50000 #. -#. +#. #. #. @@ -26126,5 +26114,5 @@ #. 50000 #. -#. +#. #. #. @@ -26134,5 +26122,5 @@ #. 50000 #. -#. +#. #. #. @@ -26142,5 +26130,5 @@ #. 50000 #. -#. +#. #. #. @@ -26150,5 +26138,5 @@ #. 50000 #. -#. +#. #. #. @@ -26158,5 +26146,5 @@ #. 50000 #. -#. +#. #. #. @@ -26166,5 +26154,5 @@ #. 50000 #. -#. +#. #. #. @@ -26175,5 +26163,5 @@ #. 50000 #. -#. +#. #. #. @@ -26183,5 +26171,5 @@ #. 50000 #. -#. +#. #. #. @@ -26191,5 +26179,5 @@ #. 40000 #. -#. +#. #. #. @@ -26199,5 +26187,5 @@ #. 50000 #. -#. +#. #. #. @@ -26206,5 +26194,5 @@ #. 40000 #. -#. +#. #. #. @@ -26213,5 +26201,5 @@ #. 40000 #. -#. +#. #. #. @@ -26229,7 +26217,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26239,5 +26227,5 @@ #. 50000 #. -#. +#. #. #. @@ -26247,5 +26235,5 @@ #. 50000 #. -#. +#. #. #. @@ -26255,5 +26243,5 @@ #. 50000 #. -#. +#. #. #. @@ -26263,5 +26251,5 @@ #. 50000 #. -#. +#. #. #. @@ -26271,5 +26259,5 @@ #. 50000 #. -#. +#. #. #. @@ -26279,5 +26267,5 @@ #. 50000 #. -#. +#. #. #. @@ -26287,5 +26275,5 @@ #. 50000 #. -#. +#. #. #. @@ -26295,5 +26283,5 @@ #. 50000 #. -#. +#. #. #. @@ -26303,5 +26291,5 @@ #. 50000 #. -#. +#. #. #. @@ -26320,5 +26308,5 @@ #. 50000 #. -#. +#. #. #. @@ -26332,5 +26320,5 @@ #. 50000 #. -#. +#. #. #. @@ -26344,5 +26332,5 @@ #. 50000 #. -#. +#. #. #. @@ -26352,5 +26340,5 @@ #. 50000 #. -#. +#. #. #. @@ -26364,5 +26352,5 @@ #. 50000 #. -#. +#. #. #. @@ -26376,5 +26364,5 @@ #. 50000 #. -#. +#. #. #. @@ -26388,6 +26376,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26397,5 +26385,5 @@ #. 50000 #. -#. +#. #. #. @@ -26409,5 +26397,5 @@ #. 50000 #. -#. +#. #. #. @@ -26421,5 +26409,5 @@ #. 50000 #. -#. +#. #. #. @@ -26433,5 +26421,5 @@ #. 50000 #. -#. +#. #. #. @@ -26445,5 +26433,5 @@ #. 50000 #. -#. +#. #. #. @@ -26457,5 +26445,5 @@ #. 50000 #. -#. +#. #. #. @@ -26465,7 +26453,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26475,5 +26463,5 @@ #. 50000 #. -#. +#. #. #. @@ -26483,5 +26471,5 @@ #. 50000 #. -#. +#. #. #. @@ -26491,5 +26479,5 @@ #. 50000 #. -#. +#. #. #. @@ -26499,5 +26487,5 @@ #. 50000 #. -#. +#. #. #. @@ -26514,5 +26502,5 @@ #. 50000 #. -#. +#. #. #. @@ -26525,5 +26513,5 @@ #. 50000 #. -#. +#. #. #. @@ -26537,5 +26525,5 @@ #. 50000 #. -#. +#. #. #. @@ -26549,5 +26537,5 @@ #. 50000 #. -#. +#. #. #. @@ -26561,5 +26549,5 @@ #. 50000 #. -#. +#. #. #. @@ -26570,5 +26558,5 @@ #. 50000 #. -#. +#. #. #. @@ -26578,5 +26566,5 @@ #. 50000 #. -#. +#. #. #. @@ -26586,5 +26574,5 @@ #. 50000 #. -#. +#. #. #. @@ -26594,5 +26582,5 @@ #. 50000 #. -#. +#. #. #. @@ -26602,5 +26590,5 @@ #. 50000 #. -#. +#. #. #. @@ -26617,5 +26605,5 @@ #. 50000 #. -#. +#. #. #. @@ -26629,5 +26617,5 @@ #. 50000 #. -#. +#. #. #. @@ -26641,5 +26629,5 @@ #. 50000 #. -#. +#. #. #. @@ -26653,5 +26641,5 @@ #. 50000 #. -#. +#. #. #. @@ -26665,5 +26653,5 @@ #. 50000 #. -#. +#. #. #. @@ -26677,5 +26665,5 @@ #. 50000 #. -#. +#. #. #. @@ -26684,7 +26672,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26694,5 +26682,5 @@ #. 50000 #. -#. +#. #. #. @@ -26702,5 +26690,5 @@ #. 50000 #. -#. +#. #. #. @@ -26710,5 +26698,5 @@ #. 50000 #. -#. +#. #. #. @@ -26718,5 +26706,5 @@ #. 50000 #. -#. +#. #. #. @@ -26726,5 +26714,5 @@ #. 50000 #. -#. +#. #. #. @@ -26734,5 +26722,5 @@ #. 50000 #. -#. +#. #. #. @@ -26742,5 +26730,5 @@ #. 50000 #. -#. +#. #. #. @@ -26757,7 +26745,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26767,5 +26755,5 @@ #. 50000 #. -#. +#. #. #. @@ -26775,5 +26763,5 @@ #. 50000 #. -#. +#. #. #. @@ -26783,5 +26771,5 @@ #. 50000 #. -#. +#. #. #. @@ -26791,5 +26779,5 @@ #. 50000 #. -#. +#. #. #. @@ -26805,5 +26793,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26852,5 +26840,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26860,5 +26848,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26868,5 +26856,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26876,5 +26864,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26884,5 +26872,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26892,5 +26880,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26900,5 +26888,5 @@ #. 50000 #. -#. +#. #. #. @@ -26908,5 +26896,5 @@ #. 50000 #. -#. +#. #. #. @@ -26916,5 +26904,5 @@ #. 50000 #. -#. +#. #. #. @@ -26924,5 +26912,5 @@ #. 50000 #. -#. +#. #. #. @@ -26932,5 +26920,5 @@ #. 50000 #. -#. +#. #. #. @@ -26940,5 +26928,5 @@ #. 50000 #. -#. +#. #. #. @@ -26958,5 +26946,5 @@ #. 50000 #. -#. +#. #. #. @@ -26965,5 +26953,5 @@ #. 50000 #. -#. +#. #. #. @@ -26972,5 +26960,5 @@ #. 50000 #. -#. +#. #. #. @@ -26979,5 +26967,5 @@ #. 40000 #. -#. +#. #. #. @@ -26986,5 +26974,5 @@ #. 40000 #. -#. +#. #. #. @@ -26993,5 +26981,5 @@ #. 40000 #. -#. +#. #. #. @@ -27086,5 +27074,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -27092,28 +27080,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 @@ -27228,5 +27216,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27239,5 +27227,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27262,6 +27250,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27270,6 +27258,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27284,6 +27272,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 @@ -27297,6 +27285,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 @@ -27316,6 +27304,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27339,6 +27327,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 @@ -27351,4 +27339,80 @@ msgstr "" +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "" +#~ "Kan inte ångra kommando \"{0}\" eftersom lager \"{1}\" inte längre är " +#~ "närvarande" + +#~ msgid "Images for {0}" +#~ msgstr "Bilder för {0}" + +#~ msgid "Read GPX..." +#~ msgstr "Läs in GPX..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Tid saknas för punkt {0} x {1}" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Inga bilder med läsbara tidsangivelser hittades." + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS startpunkt: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS slutpunkt: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "nuvarande delta: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "tidsskillnad: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} inom spåret." + +#~ msgid "Sync clock" +#~ msgstr "Synka klocka" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "Datum i fil \"{0}\" kunde inte tolkas." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"." + +#~ msgid "Image" +#~ msgstr "Bild" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "Tidszon för GPS-enhet (skillnad mot foto)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "Synkronisera Tid med GPS-enheten" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Angiven tid kunde inte tolkas." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Geotaggade bilder" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "Öppna bilder med AgPifoJ..." + +#~ msgid "osmarender options" +#~ msgstr "inställningar för osmarender" + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "\"Another geotag plugin\" (Ytterligare ett geotag-plugin) för JOSM. " +#~ "Korrelerar bilder med GPS-spår eller importerar EXIF-geotaggade bilder." + #~ msgid "Move" #~ msgstr "Flytta" @@ -27393,5 +27457,4 @@ #~ msgstr "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Fel vid inläsning av sida{0}" @@ -27401,8 +27464,9 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" -#~ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop dem?" +#~ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop " +#~ "dem?" #~ msgid "Merge nodes with different memberships?" @@ -27413,12 +27477,7 @@ #~ "Det finns inte något öppet dokument, så det finns inte något att spara." -#, java-format #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "Jämka {0} konflikter i {1} objekt" -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Ta bort {1} {0}" - #~ msgid "Conflicting relation" #~ msgstr "Relationskonflikt" @@ -27442,5 +27501,4 @@ #~ msgstr "deras version:" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27466,7 +27524,4 @@ #~ msgstr "Ingen data importerad." -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Ange först önskade koordinater." - #~ msgid "Tags (empty value deletes tag)" #~ msgstr "Taggar (tomt värde tar bort taggen)" @@ -27504,7 +27559,7 @@ #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "" -#~ "Tips: Några av ändringarna härrör från inskickning av nya data till servern." - -#, java-format +#~ "Tips: Några av ändringarna härrör från inskickning av nya data till " +#~ "servern." + #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}" @@ -27517,5 +27572,4 @@ #~ "JOSM från." -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "Använd snabbval ''{0}''" @@ -27563,5 +27617,4 @@ #~ msgstr "Navigation" -#, java-format #~ msgid "requested: {0}" #~ msgstr "begärd: {0}" @@ -27586,6 +27639,6 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" #~ "Återställ alla de nu valda objekten till den version som valts i " @@ -27593,13 +27646,13 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" -#~ "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop dem?" +#~ "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop " +#~ "dem?" #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}." @@ -27612,8 +27665,7 @@ #~ "setting the config option 'pluginmanager.warntime'.)" #~ msgstr "" -#~ "(Du kan ändra det tidsintervall (i dagar) med vilket denna varning visas
" -#~ "med hjälp av inställningen 'pluginmanager.warntime'.)" - -#, java-format +#~ "(Du kan ändra det tidsintervall (i dagar) med vilket denna varning " +#~ "visas
med hjälp av inställningen 'pluginmanager.warntime'.)" + #~ msgid "Please report a ticket at {0}" #~ msgstr "Lämna in en rapport på {0}" @@ -27624,13 +27676,9 @@ #~ msgid "Include your steps to get to the error (as detailed as possible)!" #~ msgstr "" -#~ "Berätta de steg du genomförde för att nå fram till felet (så detaljerat som " -#~ "möjligt)!" +#~ "Berätta de steg du genomförde för att nå fram till felet (så detaljerat " +#~ "som möjligt)!" #~ msgid "Edit Properties" #~ msgstr "Redigera egenskaper" - -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Fel vid borttagande av fil för insticksmodulen: {0}" #~ msgid "Plugin already exists" @@ -27659,5 +27707,4 @@ #~ msgstr "Id för Metacartas korrigerade kartbild" -#, java-format #~ msgid "rectifier id={0}" #~ msgstr "korrigeringsid={0}" @@ -27696,14 +27743,13 @@ #~ msgstr "cykelkarta" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''" #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" -#~ "Innan du rapporterar in ett fel, försök först att uppdatera till den nyaste " -#~ "versionen av JOSM och alla insticksmoduler." +#~ "Innan du rapporterar in ett fel, försök först att uppdatera till den " +#~ "nyaste versionen av JOSM och alla insticksmoduler." #~ msgid "Found element in non-relation." @@ -27715,10 +27761,10 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" -#~ "VARNING: Lösenordet lagras okryperat i " -#~ "inställningsfilen.
Lösenordet skickas okryperat till servern, som en del " -#~ "av URL:en.
Använd inte ett värdefullt lösenord." +#~ "VARNING: Lösenordet lagras okryperat i inställningsfilen." +#~ "
Lösenordet skickas okryperat till servern, som en del av URL:en." +#~ "
Använd inte ett värdefullt lösenord." #~ msgid "" @@ -27734,6 +27780,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -27750,6 +27796,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example,replacing 73 with your image id: \n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -27761,6 +27807,6 @@ #~ "inställningsfliken för WMSplugin - dessa kommer att synas i WMS-menyn.\n" #~ "\n" -#~ "Du kan också göra dessa ändringar manuellt under avancerade inställningar, " -#~ "enligt följande mall:\n" +#~ "Du kan också göra dessa ändringar manuellt under avancerade " +#~ "inställningar, enligt följande mall:\n" #~ "wmsplugin.url.1.name=Landsat\n" #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" @@ -27772,13 +27818,14 @@ #~ "format=image/jpeg \n" #~ "\n" -#~ "Vad gäller Metacartas Kartkorrigerare http://labs.metacarta.com/rectifier/ , " -#~ "så behöver du enbart ange relevant 'id'.\n" -#~ "För att lägga till en menypost för en korrigerad karta från Metacarta, skapa " -#~ "manuellt en url som i följande exempel och ersätt 73 med id för din bild: \n" +#~ "Vad gäller Metacartas Kartkorrigerare http://labs.metacarta.com/" +#~ "rectifier/ , så behöver du enbart ange relevant 'id'.\n" +#~ "För att lägga till en menypost för en korrigerad karta från Metacarta, " +#~ "skapa manuellt en url som i följande exempel och ersätt 73 med id för din " +#~ "bild: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" #~ " \n" -#~ "Observera: Se till att bilden får användas enligt copyright-regler, om du är " -#~ "tveksam så använd inte den." +#~ "Observera: Se till att bilden får användas enligt copyright-regler, om du " +#~ "är tveksam så använd inte den." #~ msgid "Portcullis" @@ -27792,10 +27839,10 @@ #~ "some time." #~ msgstr "" -#~ "Servern svarade med internt fel. Försök med ett mindre område eller försök " -#~ "igen efter en stund." - -#, java-format +#~ "Servern svarade med internt fel. Försök med ett mindre område eller " +#~ "försök igen efter en stund." + #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" #~ "Insticksmodulen {0} verkar korrupt eller kunde inte hämtas automatiskt." @@ -27804,5 +27851,4 @@ #~ msgstr "Skicka in till OSM..." -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -27819,5 +27865,4 @@ #~ msgstr "Tom medlem i relationen." -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Kan inte öppna inställningsmappen: {0}" @@ -27844,13 +27889,10 @@ #~ msgstr "Ersätter urvalet med användarens data" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Upphovsmän: {0}" -#, java-format #~ msgid "Layers: {0}" #~ msgstr "Lager: {0}" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Konflikter: {0}" @@ -27876,10 +27918,11 @@ #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "" -#~ "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och panorera." - -#, java-format +#~ "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och " +#~ "panorera." + #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "" -#~ "Hoppar över en sträcka eftersom den innehåller en nod som inte finns: {0}\n" +#~ "Hoppar över en sträcka eftersom den innehåller en nod som inte finns: " +#~ "{0}\n" #~ msgid "Please select one or more closed ways of at least four nodes." @@ -27924,9 +27967,9 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" -#~ "Internt fel: kan inte kontrollera förhållanden för inget lager. Rapportera " -#~ "in detta som ett fel." +#~ "Internt fel: kan inte kontrollera förhållanden för inget lager. " +#~ "Rapportera in detta som ett fel." #~ msgid "Delete Layer" @@ -27947,6 +27990,6 @@ #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." #~ msgstr "" -#~ "DETTA ÄR EXPERIMENTKOD. Spara och kontrollera ditt arbete innan du skickar " -#~ "in det." +#~ "DETTA ÄR EXPERIMENTKOD. Spara och kontrollera ditt arbete innan du " +#~ "skickar in det." #~ msgid "sports" @@ -27956,5 +27999,4 @@ #~ msgstr "Flytta nedåt" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "Relationsredigerare:{0}" @@ -27970,15 +28012,14 @@ #~ "skickats in har en historik." -#, java-format #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " #~ "continue?" #~ msgstr "" -#~ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du fortsätta?" +#~ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du " +#~ "fortsätta?" #~ msgid "Update Data" #~ msgstr "Uppdatera data" -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "Ändra projektionen till {0} först." @@ -27994,8 +28035,9 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" -#~ "Ingen data som behövde uppdateras hittades. Har du redan öppnat eller laddat " -#~ "ner ett datalager?" +#~ "Ingen data som behövde uppdateras hittades. Har du redan öppnat eller " +#~ "laddat ner ett datalager?" #~ msgid "Remove route nodes" @@ -28005,5 +28047,4 @@ #~ msgstr "Slå ihop sträckor med olika roller?" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -28025,5 +28066,4 @@ #~ msgstr "Ångrar radering av väg..." -#, java-format #~ msgid "Checking whether node {0} is gone ..." #~ msgstr "Kontrollerar huruvida nod {0} är borta..." @@ -28032,30 +28072,30 @@ #~ msgstr "Återskapar relation..." -#, java-format #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Kontrollerar huruvida primitiv {0} är borta..." -#, java-format #~ msgid "" -#~ "The OSM primitive with id {0} has been deleted
on " -#~ "the server by another mapper.

Click {1} to keep your " -#~ "primitive and ignore the deleted state.
Your primitive will be assigend a " -#~ "new id.
Click {2} to accept the state on the server and " -#~ "to delete your primitive.
Click {3} to cancel.
" +#~ "The OSM primitive with id {0} has been " +#~ "deleted
on the server by another mapper.

Click {1} to keep your primitive and ignore the deleted state.
Your " +#~ "primitive will be assigend a new id.
Click {2} to " +#~ "accept the state on the server and to delete your primitive.
Click " +#~ "{3} to cancel.
" #~ msgstr "" -#~ "OSM primitiv id {0} har raderats på servern
av en " -#~ "annan kartograf.

Klicka {1} för att behålla ditt " -#~ "primitiv och ignorera det raderade tillståndet.
Ditt primitiv kommer att " -#~ "tilldelas ett nytt id.
Klicka {2} för att acceptera det " -#~ "nya tillståndet på servern och radera ditt primitiv.
Klicka " -#~ "{3} för att avbryta.
" - -#, java-format +#~ "OSM primitiv id {0} har raderats på servern
av " +#~ "en annan kartograf.

Klicka {1} för att behålla " +#~ "ditt primitiv och ignorera det raderade tillståndet.
Ditt primitiv " +#~ "kommer att tilldelas ett nytt id.
Klicka {2} för att " +#~ "acceptera det nya tillståndet på servern och radera ditt primitiv." +#~ "
Klicka {3} för att avbryta.
" + #~ msgid "" -#~ "There are {0} primitives
selected for individual " -#~ "update. Please reduce the selection
to max. {1} primitives." +#~ "There are {0} primitives
selected for " +#~ "individual update. Please reduce the selection
to max. {1} primitives." +#~ "" #~ msgstr "" -#~ "Det finns {0} primitiv
markerade för individuell " -#~ "uppdatering. Vänligen reducera
urvalet till max {1} primitiv." +#~ "Det finns {0} primitiv
markerade för " +#~ "individuell uppdatering. Vänligen reducera
urvalet till max {1} " +#~ "primitiv." #~ msgid "Selection too big" @@ -28095,5 +28135,4 @@ #~ msgstr "Inga data" -#, java-format #~ msgid "" #~ "Uploading failed because a primitive you tried " @@ -28102,8 +28141,7 @@ #~ msgstr "" #~ "Uppladdning misslyckades eftersom en primitiv du " -#~ "försökte
ta bort från servern redan är borttagen.

Felmeddelandet " -#~ "är:
{0}" - -#, java-format +#~ "försökte
ta bort från servern redan är borttagen." +#~ "

Felmeddelandet är:
{0}" + #~ msgid "" #~ "WARNING: launching browser windows for the first {0} of {1} selected " @@ -28113,9 +28151,7 @@ #~ "primitiven." -#, java-format #~ msgid "Remove relation member {0} {1}" #~ msgstr "Radera relationsmedlem {0} {1}" -#, java-format #~ msgid "" #~ "There are unsaved changes in {0} layer. Discard the changes and continue?" @@ -28123,7 +28159,9 @@ #~ "There are unsaved changes in {0} layers. Discard the changes and continue?" #~ msgstr[0] "" -#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och fortsätt?" +#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och " +#~ "fortsätt?" #~ msgstr[1] "" -#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och fortsätt?" +#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och " +#~ "fortsätt?" #~ msgid "Download referrers from OSM..." @@ -28133,15 +28171,13 @@ #~ msgstr "Laddar ner referenser..." -#, java-format #~ msgid "Help page missing. Create it in English." #~ msgstr "Hjälpsida saknas. Skapa den på engelska." -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" -#~ "Hjälpsida saknas. Skapa den på engelska eller ditt språk." +#~ "Hjälpsida saknas. Skapa den på engelska eller ditt språk." #~ msgid "Helppage missing. Create it in English." @@ -28149,11 +28185,10 @@ #~ msgid "" -#~ "Helppage missing. Create it in English or your language." +#~ "Helppage missing. Create it in English or your language." #~ msgstr "" -#~ "Hjälpsida saknas. Skapa den på engelska eller ditt språk." - -#, java-format +#~ "Hjälpsida saknas. Skapa den på engelska eller ditt språk." + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "oförväntat returvärde. Erhöll {0}" Index: /applications/editors/josm/i18n/po/tr.po =================================================================== --- /applications/editors/josm/i18n/po/tr.po (revision 18974) +++ /applications/editors/josm/i18n/po/tr.po (revision 18975) @@ -10,6 +10,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 15:01+0000\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-11-29 22:29+0000\n" "Last-Translator: katpatuka \n" "Language-Team: Türkçe\n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:05+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -31,6 +31,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 @@ -47,7 +47,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 @@ -63,19 +63,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 @@ -88,9 +87,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" @@ -118,5 +117,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 @@ -139,9 +138,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 @@ -157,20 +156,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 @@ -189,7 +184,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 "Hata" @@ -269,5 +264,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 "Eklentiler" @@ -308,4 +303,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 @@ -313,8 +310,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 @@ -324,29 +321,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 @@ -375,6 +370,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 "" @@ -426,14 +421,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 "Enlem" #: ../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 "Boylam" @@ -459,10 +454,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 @@ -493,19 +488,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 @@ -514,9 +512,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 @@ -532,7 +527,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 @@ -544,11 +539,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" @@ -636,5 +631,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}" @@ -687,10 +682,10 @@ msgstr "Yollar birleştiriledi (Tek bir yoluna konulamadı)" -#: ../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} yol birleştir" -#: ../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 "Lütfen birleştirmek için en az iki yol seçiniz." @@ -709,19 +704,19 @@ msgstr "Lütfen kopyalama için seçim yapınız" +#: ../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 "Daire Oluştur" -#: ../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 "Seçili üç noktadan daire oluştur." -#: ../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 "Bu noktalar daire şeklinde değiller. Vazgeçtik." -#: ../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 " @@ -734,9 +729,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 @@ -808,21 +803,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" @@ -830,6 +829,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 @@ -858,5 +857,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 "Çift" @@ -913,8 +912,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 @@ -922,5 +919,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 @@ -933,8 +930,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 @@ -953,8 +950,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 @@ -977,13 +974,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 @@ -1023,4 +1021,103 @@ 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 "" +"Seçilen yollar indirilen alanın dışındada noktalara sahip.\n" +"Bu işlem yanlışlıkla nokta silinmesine sebep olabilir.\n" +"Devam etmek istiyormusunuz?" + +#: ../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 "lütfen emin değilseniz iptal ediniz" + +#: ../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 "Bütün çakışmaları için yeni değerler gir." + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 +msgid "Solve Conflicts" +msgstr "Çakışmaları Çöz" + +#: ../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 @@ -1040,4 +1137,45 @@ msgstr "Kısayol Yok" +#: ../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" @@ -1048,26 +1186,26 @@ msgstr "Varsayılan tabaka başka bir tabaka ile birleştir" +#: ../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 "Noktaları birleştir" -#: ../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 "Noktaları en eskisiyle birleştir" -#: ../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 "Birleştirmek için en azından iki nokta seçmen lazım." -#: ../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 "" @@ -1075,5 +1213,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" @@ -1447,6 +1585,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 "" @@ -1466,9 +1603,39 @@ #: ../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 "Yolu Basitleştir" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +msgid "Delete unnecessary nodes from a way." +msgstr "Yoldan gereksiz noktaları sil." + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83 +msgid "Please select at least one way to simplify." +msgstr "Lütfen basitleştime için en az bir yol seçiniz." + +#: ../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] "Seçin {0} kadar yol içeriri. Basitleştireceğinize emin misiniz?" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90 +msgid "Are you sure?" +msgstr "Emin misiniz?" + +#: ../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] "Yolu Basitleştir ({0} nokta kaldır)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1590,6 +1757,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 "* Birden fazla yol için veya şu yollardan biri için, veya" @@ -1671,54 +1837,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 "" @@ -1727,35 +1893,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 "Yüklenilecek değişiklik yok." -#: ../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 "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız." -#: ../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 "" @@ -1763,28 +1929,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 "" @@ -1794,22 +1958,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 "" @@ -1820,15 +1984,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 "" @@ -1840,6 +2004,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 "" @@ -1848,38 +2012,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 "" @@ -2043,6 +2206,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 "" @@ -2111,38 +2274,38 @@ msgstr "seçilmiş" -#: ../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 "Dünya dışına bir kavşak ekleyemezsiniz." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535 msgid "Add node" msgstr "Kavşak Ekle" -#: ../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 "Yola kavşak ekle" -#: ../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 "Varolan yolu kavşağa ekle" -#: ../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 "Varolan yola kavaşka ekle" -#: ../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 "Yola kavşak ekle ve birleştir" -#: ../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." @@ -2151,14 +2314,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 "" @@ -2194,6 +2357,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 "" "Çalan dosyayı sürükle ve bir izin yakınında bırak; SHIFT+bıraksesi " @@ -2280,6 +2443,6 @@ "move zoom with right button" msgstr "" -"Sürükleyerek Zoom yap; Ctrl+ veya Ctrl-; beraber taşı " -"Ctrl+Yukarı,aşağı,sol,sağzoom taşı ise sağ klik" +"Sürükleyerek Zoom yap; Ctrl+ veya Ctrl-; beraber taşı Ctrl+Yukarı,aşağı,sol," +"sağzoom taşı ise sağ klik" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 @@ -2294,5 +2457,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." @@ -2375,12 +2538,16 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +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-" @@ -2388,43 +2555,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 @@ -2434,55 +2601,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 "Arama" -#: ../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}'' için herhangi karşılık bulunamadı" -#: ../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 "''{0}'' için yapılan aramada herhangi bir ekleme yapılmadı." -#: ../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 "''{0}'' için yapılan aramada, herhangi birşey çıkartılmadı" -#: ../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} Eşleşme bulundu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2495,40 +2662,40 @@ "{2}" -#: ../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 "or için eksik argüman." -#: ../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 "not için eksik argüman." -#: ../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 "Parantezlerin kapanması beklenir." -#: ../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 "" @@ -2537,9 +2704,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 "" @@ -2548,5 +2715,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." @@ -2597,6 +2764,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 "" @@ -2604,5 +2770,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 "" @@ -2737,5 +2903,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 "" @@ -2754,5 +2920,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 "" @@ -2771,19 +2938,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" @@ -2792,5 +2959,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" @@ -2799,5 +2966,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" @@ -2806,5 +2973,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" @@ -2815,15 +2982,15 @@ #. 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?" +#: ../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 "" "İndirdiğiniz alan dışındaki bir kavşağı sileceksiniz.
Göremediğiniz başka " "objeler onu kullanıyor olabilir.
Gerçekten silmek istiyormusunuz?" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444 msgid "Delete confirmation" msgstr "" @@ -2841,15 +3008,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 "" @@ -2858,5 +3025,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}" @@ -2866,9 +3033,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 "" @@ -2948,5 +3110,5 @@ msgstr "Uygula?" -#: ../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 " @@ -3091,6 +3253,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 "" @@ -3173,5 +3335,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3180,5 +3342,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3186,25 +3348,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 "G" #. 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 "K" #. 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 "B" #. 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 "D" #: ../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 @@ -3227,25 +3389,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}" @@ -3253,6 +3416,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 "" @@ -3315,24 +3478,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 " @@ -3340,5 +3503,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 "" @@ -3370,6 +3533,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}." @@ -3390,5 +3553,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 @@ -3400,6 +3562,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 "" @@ -3410,135 +3571,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 "Alan stili yol kapalı değil." -#: ../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 "multipoligon yolu ''{0}'' kapalı değil." -#: ../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}'' üyesini ilişkiden sil." -#: ../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 "Yol ''{0}'' iki noktadan az içeriyor." -#: ../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:557 +msgid "More than one \"to\" way found." +msgstr "" + +#: ../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:568 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#, java-format +msgid "Unknown role ''{0}''." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 -msgid "More than one \"to\" way found." +#, java-format +msgid "Unknown member type for ''{0}''." msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 -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 -#, java-format -msgid "Unknown role ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 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 "Bu ''{0}'' ve ''{1}'' yolları arasında kesişim." -#: ../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 "iç yol ''{0}'' dışarıda." -#: ../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 "Kullanışlı rol yok ''{0}'' ''{1}'' yolu için." -#: ../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 "Yol-Değil ''{0}'' multipolygon içinde." -#: ../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 "Multipoligon için dış yol yok ''{0}''." -#: ../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 "İç yol stili ''{0}'' multipolygon ." -#: ../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 "Dış yol stili ''{0}'' bulunamadı." -#: ../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 "etiketsiz" -#: ../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 "metin" -#: ../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 "Hata: {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}" @@ -3550,5 +3711,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 @@ -3565,5 +3726,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 @@ -3582,5 +3743,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 "arkaplan" @@ -3698,6 +3859,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 "" @@ -3712,5 +3872,5 @@ msgstr "Tekrar Gösterme" -#: ../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 @@ -3718,32 +3878,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 "eksik" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 msgid "highway" msgstr "Karayolu" -#: ../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 "demiryolu" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "waterway" msgstr "suyolu" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 msgid "landuse" msgstr "arazi kullanımı" -#: ../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" @@ -3751,5 +3911,5 @@ msgstr[0] "{0} Kavşak" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -3998,12 +4158,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163 msgid "File" msgstr "Dosya" -#: ../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 @@ -4017,19 +4177,19 @@ msgstr "Düzenle" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 msgid "View" msgstr "Görünüm" -#: ../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 "Araçlar" -#: ../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 "Ayarlanmış" -#: ../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 @@ -4040,5 +4200,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "Ses" @@ -4082,29 +4242,29 @@ msgstr "ölçek" -#: ../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 "Fare imleci üzerindeki coğrafi boylam." -#: ../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 "Fare imleci üzerindeki objenin adı." -#: ../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 "Fare imleci üzerindeki coğrafi enlem." -#: ../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 "Önceki ve şimdiki yol kısımları arasındaki açı." -#: ../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 "Segment çizildi." -#: ../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 "Yeni yol segmentinin uzunluğu çizildi." -#: ../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 " @@ -4112,9 +4272,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 msgid "(no object)" msgstr "(obje yok)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 msgid "User:" msgstr "" @@ -4220,5 +4380,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" @@ -4227,5 +4387,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" @@ -4234,5 +4394,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" @@ -4251,5 +4411,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 @@ -4266,5 +4426,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" @@ -4336,22 +4496,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." @@ -4430,6 +4590,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 "" @@ -4498,6 +4657,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "" @@ -4505,6 +4664,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "" @@ -4561,6 +4720,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 "" @@ -4593,7 +4752,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 "" @@ -4739,5 +4898,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 "" @@ -4872,5 +5031,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 "" @@ -4970,7 +5129,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" @@ -4979,6 +5138,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" @@ -5011,7 +5170,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 "" @@ -5100,5 +5257,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 @@ -5163,10 +5320,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 "" @@ -5241,18 +5397,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 "Geçmiş" -#: ../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 "Seçili nesnelerin geçmişini göster." -#: ../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 @@ -5262,13 +5418,13 @@ msgstr "Yenile" -#: ../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 "Reload all currently selected objects and refresh the list." -#: ../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 "" @@ -5459,5 +5615,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 "" @@ -5500,30 +5656,30 @@ msgstr "Seçime yakınlaş" -#: ../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 "Seçim.: İlişki.:{0} / Yollar:{1} / Kavşaklar:{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 "Seçim" -#: ../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 "Seçim: {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 "Panelin kilidini Kaldır" -#: ../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 "Paneli Kapat. Soldaki araç çubuğundan tekrar açabilirsiniz." -#: ../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 "paneli büyütüp/küçültmek için tıklayınız" @@ -5583,37 +5739,37 @@ msgstr "# Objeler" -#: ../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 "" @@ -5622,63 +5778,89 @@ 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] "Bütün eksik yolları ve kavşakları ilişkili olarak indir" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 +#, fuzzy +msgid "Download relations" +msgstr "Lokasyonu indir" + +#: ../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 +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 "Seçili ilişki için bir editör aç." + +#: ../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 "" @@ -5688,15 +5870,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 " @@ -5704,5 +5886,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 " @@ -5710,20 +5892,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 "" @@ -5732,66 +5914,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 "Spor" + +#: ../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 "Seçili üyeyi yukarı taşı" #. 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 "Seçili üyeyi aşağı taşı" #. 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 " @@ -5800,53 +5986,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 "Bütün eksik yolları ve kavşakları ilişkili olarak indir" -#: ../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 "Üyeleri İndir" -#: ../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 "" @@ -5856,41 +6048,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 "" @@ -5930,19 +6115,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}''" @@ -5954,6 +6139,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 "" @@ -6131,7 +6315,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 "" @@ -6904,5 +7087,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 @@ -7139,6 +7322,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 "" @@ -7148,6 +7331,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 "" @@ -7410,13 +7593,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}" @@ -7517,6 +7700,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 "" @@ -7601,6 +7783,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] "" @@ -7614,6 +7796,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 " @@ -7668,5 +7850,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 " @@ -7674,5 +7856,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 "" @@ -7745,40 +7927,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 "Eklenilecek objeler:" -#: ../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 "Düzenlenecek objeler:" -#: ../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 "Silinecek objeler:" -#: ../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:" @@ -7787,5 +7969,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:" @@ -7794,5 +7976,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:" @@ -7801,68 +7983,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 "lütfen ilk olarak istenilen koordinatı giriniz." + +#: ../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 "Yaptığınız yükleme için kısa bir bilgi yazınız:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 +#: ../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}" @@ -7870,16 +8051,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}." @@ -7887,6 +8068,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 "" @@ -7895,5 +8076,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 "" @@ -7923,110 +8104,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 -#, java-format -msgid "Images for {0}" -msgstr "{0} için görüntüler" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 -msgid "Read GPX..." -msgstr "GPX Oku..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 -#, java-format -msgid "No time for point {0} x {1}" -msgstr "Noktalrı için {0} x {1} zaman yok" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 -#, java-format -msgid "Cannot read time \"{0}\" from point {1} x {2}" -msgstr "Zaman şu noktalar \"{0}\" {1} x {2} için okunamadı" - -#: ../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} Okunuyor..." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 -msgid "No images with readable timestamps found." -msgstr "Zaman damgası okunabilen bir görüntü bulunamadı." - -#: ../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 "Geotagged Görüntüler" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "GPS başlangıç: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "GPS bitiş: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "current delta: {0}s" -msgstr "şu anki delta: {0}s" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -msgid "timezone difference: " -msgstr "zaman dilimi farkı: " - -#: ../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] "görüntü" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 -#, java-format -msgid "{0} within the track." -msgstr "{0} izde var." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 -msgid "Sync clock" -msgstr "Saati eşle" - -#: ../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 "JPEG görüntüsü (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "\"{0}\" dosyasındaki zaman ayrıştırılamadı." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "EXIF zamanı \"{0}\" dosyasında yok." - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 -msgid "Image" -msgstr "Görüntü" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "Gösterilecek tarihi giriniz (ay/gün/yıl saat:dakika:saniye)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "GPS ünitesi zamandilimi (resim farkı)" - -#: ../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 "Girilen zaman ayrıştırılamadı." - -#: ../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} metre" + +#: ../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 "Lütfen bir kullanıcı adı giriniz" + +#: ../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 @@ -8034,30 +8159,30 @@ msgstr "gps noktası" -#: ../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 "Çizimi özelleştir" -#: ../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 "Genel ayarları kullan." -#: ../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 "Bu tabaka için çizgiler arasını birleştir." -#: ../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 "Bu tabaka için çizgileri birleştirme." -#: ../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 "Çizim seçeneklerini seçiniz" -#: ../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 @@ -8065,5 +8190,5 @@ msgstr "Renkleri Ayarla" -#: ../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 @@ -8072,5 +8197,5 @@ msgstr "Varsayılan" -#: ../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 @@ -8079,58 +8204,63 @@ msgstr "Renk seç" -#: ../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 "işaretli noktalardan imleçler" -#: ../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 "{0} isim verilen izler" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215 msgid "Import Audio" msgstr "Sesi içeri al" -#: ../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 "Wave Audio files (*.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} daki ses imleçleri" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301 msgid "Import images" msgstr "Görüntüleri içeri al" -#: ../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 "JPEG görüntüsü (*.jpg)" + +#: ../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 "İsim: {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 @@ -8138,5 +8268,5 @@ msgstr "Tanım: {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" @@ -8146,5 +8276,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 @@ -8152,22 +8282,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 "Uzunluk: " -#: ../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, " @@ -8175,5 +8300,5 @@ msgstr[0] "{0} rut, " -#: ../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" @@ -8181,24 +8306,24 @@ msgstr[0] "{0} yol noktaları" -#: ../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 "Bilgi tabakasına çevir" -#: ../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:" +#: ../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 "" "İşlenilmemiş GPS bilgisis yüklemek zararlı olabilir.
Eğer izleri " "yüklemek isterseniz buraya bakınız:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800 +#: ../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 @@ -8208,29 +8333,29 @@ msgstr "Çevrildiği yer: {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 "OSM den bu izi indir" -#: ../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 "Bunun içindeki herşeyi indir:" -#: ../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} metre" -#: ../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 "Her istek için max. alan:" -#: ../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} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963 #, java-format msgid "" @@ -8241,9 +8366,9 @@ "istiyor musunuz?" -#: ../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 "Tabakada ses ile ilişkilendirilecek GPX izi yok." -#: ../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 " @@ -8251,5 +8376,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 " @@ -8258,23 +8383,23 @@ "Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı." -#: ../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 "" -#: ../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 "indirilen alanın dışında" -#: ../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." @@ -8283,5 +8408,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 "" @@ -8295,5 +8420,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 "" @@ -8306,11 +8431,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" @@ -8319,32 +8444,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} şunları içerir:" -#: ../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 "GPX tabakasına çevir" -#: ../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 "" @@ -8352,6 +8477,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 "" @@ -8386,4 +8511,355 @@ msgstr[0] "{0} nokta" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "GPX Dosyaları (*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "{0} Dosyası \"{1}\" ismi ile yüklendi" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176 +#, java-format +msgid "Error while parsing {0}" +msgstr "Ayrıştırma sırasında hata {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Okunamadı \"{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 "" +"Zaman hesaplanırken GPS alıcınız fotoğrafını göster.
Fotoğrafı " +"burda göster.
Sadece zamanı ekrandan okuyunuz ve zaman dilimini " +"seçiniz
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "Fotoğraf zamanı (exif den):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "Gps zamanı (fotoğraftan okundu): " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [gg/aa/yyyy sa:dk:sn]" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277 +msgid "I'm in the timezone of: " +msgstr "Şu zaman dilimindeyim: " + +#: ../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 "Tarih Yok" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349 +msgid "Open an other photo" +msgstr "Başka bir fotoğraf aç" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 +msgid "Synchronize time from a photo of the GPS receiver" +msgstr "GPS receiver ile Fotoğrafın zamanını eşitle" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"Zaman bilgisi ayrıştırılamadı.\n" +"Lütfen istenen formatı kullanın" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406 +msgid "Invalid date" +msgstr "Geçersiz Tarih" + +#: ../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 "GPX izi: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "Başka GPX izi aç" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476 +msgid "Timezone: " +msgstr "Zamandilimi: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498 +msgid "Offset:" +msgstr "Offset:" + +#: ../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 "GPS alıcımın resmini çizebilirim.
yardımcı olurmu?" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 +msgid "Update position for: " +msgstr "Burası için pozisyon güncelle: " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536 +msgid "All images" +msgstr "Bütün imajlar" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546 +msgid "Images with no exif position" +msgstr "exif pozisyonu olmayan imajlar" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556 +msgid "Not yet tagged images" +msgstr "imaj henuz etiketlenmedi" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577 +msgid "Correlate images with GPX track" +msgstr "imaj ile GPX izini ilişkilendir" + +#: ../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 "GPX izi seçmelisiniz" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "seçili GPX izi yok" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"Zaman diliminde sorun var.\n" +"İstenen format: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606 +msgid "Invalid timezone" +msgstr "Geçersiz zaman dilimi" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618 +#, java-format +msgid "" +"Error while parsing offset.\n" +"Expected format: {0}" +msgstr "" +"offset bilgisisnin okunmasında sorun.\n" +"İstenen format: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619 +msgid "Invalid offset" +msgstr "Geçersiz offset" + +#: ../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 "GPX izi yüklendi" + +#: ../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 "EXIF den GPS verisi çıkartılıyor" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130 +msgid "Starting directory scan" +msgstr "klasör arama başladı" + +#: ../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 "Fotoğraflar okunuyor..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156 +#, java-format +msgid "Reading {0}..." +msgstr "{0} Okunuyor..." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 +#, java-format +msgid "Unable to get canonical path for directory {0}\n" +msgstr "Kananoik yol klasör için bulunamadı {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "Klasör aranıyor {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "Klasörde null dosya bulundu {0}\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "Klasörden dosya alınmasında hata oluştu {0}\n" + +#: ../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 "Geotagged Görüntüler" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "GPX e göre ilişkilendir" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "görüntü" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "{0} gps için etiketlenecek bulundu." + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 +msgid "No image" +msgstr "Görüntü Yok" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452 +#, java-format +msgid "Loading {0}" +msgstr "Yükleniyor {0}" + +#: ../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 "Dosyada Hata {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "geotagged fotoğraflar" + +#: ../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 "Önceki" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89 +msgid "Remove photo from layer" +msgstr "Fotoğrafı tabakadan kaldır" + +#: ../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 "Sonraki" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +msgid "Center view" +msgstr "Merkezi görünüm" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 +msgid "Zoom best fit and 1:1" +msgstr "Görüntüyü Ekrana oturt 1:1" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#, java-format +msgid "" +"\n" +"Altitude: {0} m" +msgstr "" +"\n" +"Yükseklik: {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} km/h" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8686,5 +9162,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 @@ -8878,6 +9354,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 "Yön çizgi okları için tablo değerlerini kullan hesap yapma." @@ -8936,6 +9411,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 "Daha düzgün harita grafikleri için 'antialiasing' uygula ." @@ -9003,19 +9477,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 "Görünüm" -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57 +msgid "Language" +msgstr "Dil" + +#: ../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 "Varsayılan (Otomatik Seçilir)" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66 -msgid "Language" -msgstr "Dil" - -#: ../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 @@ -9274,6 +9748,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 "" @@ -9338,11 +9812,11 @@ "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 "" "

BAzı kısayollar ilgili düğmeye ilk defa basıldığında aktif oluryani " "yaptığınız değişiklik program yeniden açılmadanda aktif olabilir fakat " -"herhangi bir sorun oluşmaması için programı yeniden " -"başlatmalısınız.

" +"herhangi bir sorun oluşmaması için programı yeniden başlatmalısınız." +"

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:170 @@ -9354,9 +9828,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 "" "

Kısayollar konusunda dikkat edilmesi gereken konu ise kısayol " @@ -9387,6 +9860,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 "" "

Sanal düzenleyci pasif haldedir, aktif hale gelince bütün kısayollar " @@ -9481,5 +9954,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 "" @@ -9565,5 +10038,5 @@ msgstr "{0} ve {1} arası bilgiler indiriliyor" -#: ../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 @@ -9571,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 "" @@ -9691,14 +10164,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 @@ -9726,24 +10198,30 @@ 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} ve {1} arası bilgiler indiriliyor" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9785,27 +10263,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 "" @@ -9813,66 +10291,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 "Kapanıyor..." -#: ../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 "Hazırlanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Uploading..." msgstr "Yükleniyor..." -#: ../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}." @@ -9907,5 +10385,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}''." @@ -9932,5 +10410,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}." @@ -9938,5 +10416,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}" @@ -9949,5 +10427,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}''." @@ -9989,6 +10467,5 @@ msgid "" "Login password to the OSM account. Leave blank to not store any password." -msgstr "" -"OSM için login şifresi, herhangi şifre saklamamak için boş bırakınız." +msgstr "OSM için login şifresi, herhangi şifre saklamamak için boş bırakınız." #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254 @@ -10006,7 +10483,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 "" @@ -10034,6 +10511,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 "" @@ -10099,46 +10576,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 "" @@ -10146,19 +10622,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 "Ref=0, eksik tanımı." -#: ../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 "Geçersiz obje bulundu 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 "" @@ -10168,8 +10644,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 "" @@ -10179,25 +10655,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 "" @@ -10205,5 +10681,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10212,5 +10688,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10218,5 +10694,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10225,13 +10701,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 "" @@ -10284,4 +10760,10 @@ msgid "Contacting Server..." msgstr "Server'e bağlanıyor..." + +#: ../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 @@ -10321,42 +10803,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 "" @@ -10398,17 +10881,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 "Sil {1} {0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153 +#, fuzzy, java-format +msgid "Delete old plugin file {0}" +msgstr "Eklentinin silinmesinde hata: {0}" + +#: ../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}." @@ -10420,19 +10913,18 @@ msgstr "Eklentide hata oluştu {0}" -#: ../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" @@ -10441,50 +10933,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 "En son eklenti güncellemesi {0} gün önce yapıldı." -#: ../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 "Eklenti Bulunamadı: {0}." -#: ../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 "Eklenti yüklenemedi {0}. Tercihlerden silinsin mi?" -#: ../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 "Eklentiyi Pasif Yap" -#: ../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 " @@ -10494,9 +10986,9 @@ "üzerine yazma yetkisi varmıdır kontrol ediniz." -#: ../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 "" @@ -10504,10 +10996,10 @@ msgstr "''{0}'' Eklentisinden beklenmeyen bir durum oluştu." -#: ../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 "Eklenti Yazarın {0} Olduğunu Belirtiyor." -#: ../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." @@ -10515,9 +11007,9 @@ "Hata bildirmeden önce eklentinin yeni versiyonu ile güncellemeyi deneyin." -#: ../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 "Eklentiyi Pasif Hale Getireyim mi?" -#: ../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 " @@ -10527,13 +11019,13 @@ "çalıştırın." -#: ../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" @@ -10651,6 +11143,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 "" @@ -10688,6 +11180,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 "" @@ -10749,7 +11241,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 "" @@ -10761,7 +11252,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 "" @@ -10793,6 +11284,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 "" @@ -11050,5 +11541,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" @@ -11063,12 +11554,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 @@ -11076,454 +11565,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 "Numara" + +#. 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 "doğal" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Estimate" +msgstr "görüntü" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113 +#, fuzzy +msgid "Potential" +msgstr "araç kiralam" + +#: ../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 +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 "AgPifoJ - Geotagged imajlar" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "geotagged fotoğraflar" - -#: ../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 "Önceki" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -msgid "Remove photo from layer" -msgstr "Fotoğrafı tabakadan kaldır" - -#: ../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 "Sonraki" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -msgid "Center view" -msgstr "Merkezi görünüm" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102 -msgid "Zoom best fit and 1:1" -msgstr "Görüntüyü Ekrana oturt 1:1" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 -#, java-format -msgid "" -"\n" -"Altitude: {0} m" -msgstr "" -"\n" -"Yükseklik: {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} km/h" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "EXIF den GPS verisi çıkartılıyor" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121 -msgid "Starting directory scan" -msgstr "klasör arama başladı" - -#: ../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 "Fotoğraflar okunuyor..." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:186 -#, java-format -msgid "Unable to get canonical path for directory {0}\n" -msgstr "Kananoik yol klasör için bulunamadı {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "Klasör aranıyor {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "Klasörde null dosya bulundu {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "Klasörden dosya alınmasında hata oluştu {0}\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "GPX e göre ilişkilendir" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "{0} gps için etiketlenecek bulundu." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "AgPifoJ ile görüntü aç..." - -#: ../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 "Görüntü kümesini yeni bir tabaka olarak kaydet." - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -msgid "GPX Files (*.gpx *.gpx.gz)" -msgstr "GPX Dosyaları (*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "{0} Dosyası \"{1}\" ismi ile yüklendi" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#, java-format -msgid "Error while parsing {0}" -msgstr "Ayrıştırma sırasında hata {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Okunamadı \"{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 "" -"Zaman hesaplanırken GPS alıcınız fotoğrafını göster.
Fotoğrafı " -"burda göster.
Sadece zamanı ekrandan okuyunuz ve zaman dilimini " -"seçiniz
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "Fotoğraf zamanı (exif den):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "Gps zamanı (fotoğraftan okundu): " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [gg/aa/yyyy sa:dk:sn]" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 -msgid "I'm in the timezone of: " -msgstr "Şu zaman dilimindeyim: " - -#: ../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 "Tarih Yok" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -msgid "Open an other photo" -msgstr "Başka bir fotoğraf aç" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 -msgid "Synchronize time from a photo of the GPS receiver" -msgstr "GPS receiver ile Fotoğrafın zamanını eşitle" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"Zaman bilgisi ayrıştırılamadı.\n" -"Lütfen istenen formatı kullanın" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -msgid "Invalid date" -msgstr "Geçersiz Tarih" - -#: ../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 "GPX izi: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "Başka GPX izi aç" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -msgid "Timezone: " -msgstr "Zamandilimi: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 -msgid "Offset:" -msgstr "Offset:" - -#: ../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 "GPS alıcımın resmini çizebilirim.
yardımcı olurmu?" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 -msgid "Update position for: " -msgstr "Burası için pozisyon güncelle: " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -msgid "All images" -msgstr "Bütün imajlar" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 -msgid "Images with no exif position" -msgstr "exif pozisyonu olmayan imajlar" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 -msgid "Not yet tagged images" -msgstr "imaj henuz etiketlenmedi" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 -msgid "Correlate images with GPX track" -msgstr "imaj ile GPX izini ilişkilendir" - -#: ../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 "GPX izi seçmelisiniz" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "seçili GPX izi yok" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"Zaman diliminde sorun var.\n" -"İstenen format: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606 -msgid "Invalid timezone" -msgstr "Geçersiz zaman dilimi" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618 -#, java-format -msgid "" -"Error while parsing offset.\n" -"Expected format: {0}" -msgstr "" -"offset bilgisisnin okunmasında sorun.\n" -"İstenen format: {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619 -msgid "Invalid offset" -msgstr "Geçersiz offset" - -#: ../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 "GPX izi yüklendi" - -#: ../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 "Görüntü Yok" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 -#, java-format -msgid "Loading {0}" -msgstr "Yükleniyor {0}" - -#: ../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 "Dosyada Hata {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11667,11 +11845,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 "" @@ -11977,11 +12154,4 @@ msgid "Export as PNG format (only raster images)" 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] "Yolu Basitleştir ({0} nokta kaldır)" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 @@ -12094,14 +12264,14 @@ msgstr "Renk Şeması" -#: ../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 " @@ -12411,4 +12581,8 @@ msgstr "ImageWayPoint ile görüntüleri aç" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "Görüntü kümesini yeni bir tabaka olarak kaydet." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" @@ -12452,18 +12626,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 "vertex düzeltme çalıştırıldı..." -#: ../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 "Douglas-Peucker çalışması yapılıyor..." -#: ../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 "Çift noktalar kaldırılıyor..." -#: ../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" @@ -12512,7 +12686,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12522,5 +12696,5 @@ #. 50000 #. -#. +#. #. #. @@ -12530,5 +12704,5 @@ #. 50000 #. -#. +#. #. #. @@ -12537,5 +12711,5 @@ #. 50000 #. -#. +#. #. #. @@ -12545,5 +12719,5 @@ #. 50000 #. -#. +#. #. #. @@ -12621,6 +12795,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 "Oluşturulan yol için max. segment sayısı. Varsayılan 250." @@ -12643,7 +12816,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 "" "Douglas-Peucker hat basitleştirme hassasiyeti, açı olarak verilir.
düşük " @@ -12675,6 +12847,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78 msgid "Tag ways as water, coastline, land or nothing. Default is water." -msgstr "" -"Yolu su, sahilşeridi,kara veya hiçbişi olarak etiketle. Varsayılan Su." +msgstr "Yolu su, sahilşeridi,kara veya hiçbişi olarak etiketle. Varsayılan Su." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79 @@ -12710,20 +12881,19 @@ msgstr "Görünüt alınamadı" -#: ../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 "Bağlanıyor" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210 msgid "Connected" msgstr "Bağlı" -#. 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 "Bağlı Değil" -#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202 +#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239 msgid "Connection Failed" msgstr "Bağlantı Hatası" @@ -12943,6 +13113,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 "Başlık çeşitli değerler taşır ve bir metine atanamaz." @@ -13023,9 +13192,10 @@ msgstr "Bilinmeyen Dosya Uzantısı: {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 "Osmarender" -#: ../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 " @@ -13035,9 +13205,5 @@ "ayarlarını yapınız" -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "osmarender seçenekleri" - -#: ../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 "Firefox exe" @@ -13412,17 +13578,17 @@ msgstr "İlk olaraklar tercihlerden etiket kaynağını seçmelisiniz." -#: ../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 "" @@ -13466,162 +13632,4 @@ msgid "Optional" 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 "" -"Seçilen yollar indirilen alanın dışındada noktalara sahip.\n" -"Bu işlem yanlışlıkla nokta silinmesine sebep olabilir.\n" -"Devam etmek istiyormusunuz?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68 -msgid "Please abort if you are not sure" -msgstr "lütfen emin değilseniz iptal ediniz" - -#: ../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 "Bütün çakışmaları için yeni değerler gir." - -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297 -msgid "Solve Conflicts" -msgstr "Çakışmaları Çöz" - -#: ../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 "Yolu Basitleştir" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 -msgid "Delete unnecessary nodes from a way." -msgstr "Yoldan gereksiz noktaları sil." - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 -msgid "Please select at least one way to simplify." -msgstr "Lütfen basitleştime için en az bir yol seçiniz." - -#: ../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] "Seçin {0} kadar yol içeriri. Basitleştireceğinize emin misiniz?" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "Emin misiniz?" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13720,5 +13728,5 @@ msgstr "Diğerlerini Onayla" -#: ../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}" @@ -13771,34 +13779,34 @@ msgstr "Seçili hatalara gelecek sefere bak." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Whole group" msgstr "Bütün Grup" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Single elements" msgstr "Tek Eleman" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "Hiçbişey" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "Bütünm grubu veya tek elemanları yoksay?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 msgid "Ignoring elements" msgstr "elemanlar Yoksayılıyor" -#: ../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 "" @@ -13847,18 +13855,18 @@ msgstr "kesişine yollar" -#: ../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 "Çift Noktalar" -#: ../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 "Bu test aynı lokasyonda birden fazla nokta varmı kontrol eder." -#: ../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 "" @@ -14094,7 +14102,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 "" "İmla kontrolu için kaynak dosya veya link veya etiket kontolcusu veri dosyası" @@ -14122,6 +14129,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:718 msgid "Validate that property values are valid checking against presets." -msgstr "" -"Önceden tanımlı değerleri kullanarak, özellik değerlerini kontrol et." +msgstr "Önceden tanımlı değerleri kullanarak, özellik değerlerini kontrol et." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 @@ -14239,5 +14245,5 @@ #. 50000 #. -#. +#. #. #. @@ -14245,5 +14251,5 @@ #. #. -#. +#. #. #. @@ -14253,5 +14259,5 @@ #. 50000 #. -#. +#. #. #. @@ -14260,5 +14266,5 @@ #. 50000 #. -#. +#. #. #. @@ -14267,5 +14273,5 @@ #. 50000 #. -#. +#. #. #. @@ -14274,5 +14280,5 @@ #. 50000 #. -#. +#. #. #. @@ -14281,5 +14287,5 @@ #. 50000 #. -#. +#. #. #. @@ -14288,9 +14294,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14335,5 +14341,5 @@ #. 50000 #. -#. +#. #. #. @@ -14468,14 +14474,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 " @@ -14484,14 +14490,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 "" @@ -14500,5 +14506,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 "" @@ -14510,13 +14516,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." @@ -14672,50 +14678,50 @@ "değiştirin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304 msgid "Download visible tiles" msgstr "Görünen mozaikleri indir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Change resolution" msgstr "Çözünürlüğü değiştir" -#: ../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 "WMS tabakasını dosyaya kaydet" -#: ../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 "WMS tabakasını dosyadan yükle" -#: ../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 "Desteklenmeyen WMS versiyonu; bulunan {0}, istenen {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 msgid "File Format Error" msgstr "Dosya Format Hatası" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error loading file" msgstr "Dosya Yüklemede Sorun" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446 msgid "Set WMS Bookmark" msgstr "" @@ -14791,5 +14797,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 "" @@ -14831,21 +14837,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 " @@ -14857,21 +14858,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 " @@ -14880,10 +14881,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 " @@ -14892,21 +14893,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 " @@ -14916,16 +14916,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 " @@ -14935,10 +14935,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 " @@ -14947,5 +14947,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 " @@ -14955,27 +14955,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 " @@ -14984,15 +14984,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 +msgid "Let other applications send commands to JOSM." +msgstr "" + +#. Plugin routes #: build/trans_plugins.java:55 -msgid "Let other applications send commands to JOSM." -msgstr "" - -#. Plugin routes -#: build/trans_plugins.java:57 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -15001,10 +15001,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 " @@ -15013,15 +15013,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 " @@ -15031,17 +15031,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 " @@ -15050,5 +15043,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -15057,10 +15050,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, ...)." @@ -16113,8 +16106,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16311,5 +16304,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16319,5 +16312,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16336,5 +16329,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16344,5 +16337,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16361,5 +16354,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16369,5 +16362,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16386,5 +16379,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16394,5 +16387,5 @@ #. 300000 #. -#. +#. #. #. @@ -16407,5 +16400,5 @@ #. 300000 #. -#. +#. #. #. @@ -16423,5 +16416,5 @@ #. 50000 #. -#. +#. #. #. @@ -16439,5 +16432,5 @@ #. 40000 #. -#. +#. #. #. @@ -16446,5 +16439,5 @@ #. 40000 #. -#. +#. #. #. @@ -16454,5 +16447,5 @@ #. 50000 #. -#. +#. #. #. @@ -16472,5 +16465,5 @@ #. 50000 #. -#. +#. #. #. @@ -16479,5 +16472,5 @@ #. 50000 #. -#. +#. #. #. @@ -16487,5 +16480,5 @@ #. 50000 #. -#. +#. #. #. @@ -16535,7 +16528,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17234,5 +17227,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17271,5 +17264,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17365,5 +17358,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17520,5 +17513,5 @@ #. 50000 #. -#. +#. #. #. @@ -18905,5 +18898,5 @@ #. 30000 #. -#. +#. #. #. @@ -18913,5 +18906,5 @@ #. 40000 #. -#. +#. #. #. @@ -18921,5 +18914,5 @@ #. 20000 #. -#. +#. #. #. @@ -18929,5 +18922,5 @@ #. 40000 #. -#. +#. #. #. @@ -19285,7 +19278,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19295,5 +19288,5 @@ #. 50000 #. -#. +#. #. #. @@ -19303,5 +19296,5 @@ #. 50000 #. -#. +#. #. #. @@ -19311,5 +19304,5 @@ #. 50000 #. -#. +#. #. #. @@ -19319,5 +19312,5 @@ #. 50000 #. -#. +#. #. #. @@ -19327,5 +19320,5 @@ #. 50000 #. -#. +#. #. #. @@ -19335,5 +19328,5 @@ #. 50000 #. -#. +#. #. #. @@ -19343,5 +19336,5 @@ #. 50000 #. -#. +#. #. #. @@ -19351,5 +19344,5 @@ #. 50000 #. -#. +#. #. #. @@ -19359,5 +19352,5 @@ #. 50000 #. -#. +#. #. #. @@ -19367,5 +19360,5 @@ #. 50000 #. -#. +#. #. #. @@ -19375,5 +19368,5 @@ #. 50000 #. -#. +#. #. #. @@ -19383,5 +19376,5 @@ #. 50000 #. -#. +#. #. #. @@ -19391,5 +19384,5 @@ #. 50000 #. -#. +#. #. #. @@ -19399,5 +19392,5 @@ #. 50000 #. -#. +#. #. #. @@ -19407,5 +19400,5 @@ #. 50000 #. -#. +#. #. #. @@ -19415,5 +19408,5 @@ #. 50000 #. -#. +#. #. #. @@ -19423,5 +19416,5 @@ #. 50000 #. -#. +#. #. #. @@ -19431,5 +19424,5 @@ #. 50000 #. -#. +#. #. #. @@ -19439,5 +19432,5 @@ #. 50000 #. -#. +#. #. #. @@ -19447,5 +19440,5 @@ #. 50000 #. -#. +#. #. #. @@ -19455,5 +19448,5 @@ #. 50000 #. -#. +#. #. #. @@ -19463,5 +19456,5 @@ #. 50000 #. -#. +#. #. #. @@ -19471,5 +19464,5 @@ #. 50000 #. -#. +#. #. #. @@ -19479,5 +19472,5 @@ #. 50000 #. -#. +#. #. #. @@ -19487,5 +19480,5 @@ #. 50000 #. -#. +#. #. #. @@ -19495,5 +19488,5 @@ #. 50000 #. -#. +#. #. #. @@ -19503,5 +19496,5 @@ #. 50000 #. -#. +#. #. #. @@ -19511,5 +19504,5 @@ #. 50000 #. -#. +#. #. #. @@ -19519,5 +19512,5 @@ #. 50000 #. -#. +#. #. #. @@ -19527,5 +19520,5 @@ #. 50000 #. -#. +#. #. #. @@ -19535,5 +19528,5 @@ #. 50000 #. -#. +#. #. #. @@ -19543,5 +19536,5 @@ #. 50000 #. -#. +#. #. #. @@ -19551,5 +19544,5 @@ #. 50000 #. -#. +#. #. #. @@ -19559,5 +19552,5 @@ #. 50000 #. -#. +#. #. #. @@ -19567,5 +19560,5 @@ #. 50000 #. -#. +#. #. #. @@ -19575,5 +19568,5 @@ #. 50000 #. -#. +#. #. #. @@ -19583,5 +19576,5 @@ #. 50000 #. -#. +#. #. #. @@ -19591,5 +19584,5 @@ #. 50000 #. -#. +#. #. #. @@ -19599,5 +19592,5 @@ #. 50000 #. -#. +#. #. #. @@ -19607,5 +19600,5 @@ #. 50000 #. -#. +#. #. #. @@ -19615,5 +19608,5 @@ #. 50000 #. -#. +#. #. #. @@ -19623,5 +19616,5 @@ #. 50000 #. -#. +#. #. #. @@ -19631,5 +19624,5 @@ #. 50000 #. -#. +#. #. #. @@ -19639,5 +19632,5 @@ #. 50000 #. -#. +#. #. #. @@ -19647,5 +19640,5 @@ #. 50000 #. -#. +#. #. #. @@ -19655,5 +19648,5 @@ #. 50000 #. -#. +#. #. #. @@ -21347,7 +21340,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21357,5 +21350,5 @@ #. 50000 #. -#. +#. #. #. @@ -21365,5 +21358,5 @@ #. 50000 #. -#. +#. #. #. @@ -21373,5 +21366,5 @@ #. 50000 #. -#. +#. #. #. @@ -21381,5 +21374,5 @@ #. 50000 #. -#. +#. #. #. @@ -21389,5 +21382,5 @@ #. 50000 #. -#. +#. #. #. @@ -21397,5 +21390,5 @@ #. 50000 #. -#. +#. #. #. @@ -21405,5 +21398,5 @@ #. 50000 #. -#. +#. #. #. @@ -22734,5 +22727,5 @@ #. 40000 #. -#. +#. #. #. @@ -22748,5 +22741,5 @@ #. 30000 #. -#. +#. #. #. @@ -22757,7 +22750,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22767,5 +22760,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22775,13 +22776,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22791,5 +22784,5 @@ #. 50000 #. -#. +#. #. #. @@ -22822,5 +22815,5 @@ #. 50000 #. -#. +#. #. #. @@ -22836,5 +22829,5 @@ #. 50000 #. -#. +#. #. #. @@ -22844,5 +22837,5 @@ #. 10000 #. -#. +#. #. #. @@ -22852,5 +22845,5 @@ #. 10000 #. -#. +#. #. #. @@ -22861,5 +22854,5 @@ #. 10000 #. -#. +#. #. #. @@ -22888,5 +22881,5 @@ #. 50000 #. -#. +#. #. #. @@ -23001,9 +22994,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 @@ -23011,5 +23004,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, @@ -23019,8 +23012,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 @@ -23034,5 +23027,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -23040,5 +23033,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23087,6 +23080,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23166,5 +23159,5 @@ #. 40000 #. -#. +#. #. #. @@ -23174,5 +23167,5 @@ #. 10000 #. -#. +#. #. #. @@ -23181,5 +23174,5 @@ #. 50000 #. -#. +#. #. #. @@ -23189,5 +23182,5 @@ #. 50000 #. -#. +#. #. #. @@ -23196,5 +23189,5 @@ #. 50000 #. -#. +#. #. #. @@ -23203,5 +23196,5 @@ #. 50000 #. -#. +#. #. #. @@ -23210,5 +23203,5 @@ #. 50000 #. -#. +#. #. #. @@ -23217,5 +23210,5 @@ #. 50000 #. -#. +#. #. #. @@ -23224,5 +23217,5 @@ #. 40000 #. -#. +#. #. #. @@ -23231,5 +23224,5 @@ #. 50000 #. -#. +#. #. #. @@ -23238,5 +23231,5 @@ #. 50000 #. -#. +#. #. #. @@ -23245,5 +23238,5 @@ #. 50000 #. -#. +#. #. #. @@ -23252,5 +23245,5 @@ #. 50000 #. -#. +#. #. #. @@ -23259,5 +23252,5 @@ #. 50000 #. -#. +#. #. #. @@ -23266,5 +23259,5 @@ #. 50000 #. -#. +#. #. #. @@ -23274,5 +23267,5 @@ #. 50000 #. -#. +#. #. #. @@ -23281,5 +23274,5 @@ #. 50000 #. -#. +#. #. #. @@ -23290,5 +23283,5 @@ #. 50000 #. -#. +#. #. #. @@ -23300,11 +23293,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23313,7 +23306,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23324,5 +23317,5 @@ #. 50000 #. -#. +#. #. #. @@ -23333,5 +23326,5 @@ #. 50000 #. -#. +#. #. #. @@ -23342,5 +23335,5 @@ #. 50000 #. -#. +#. #. #. @@ -23351,5 +23344,5 @@ #. 50000 #. -#. +#. #. #. @@ -23360,5 +23353,5 @@ #. 50000 #. -#. +#. #. #. @@ -23369,5 +23362,5 @@ #. 40000 #. -#. +#. #. #. @@ -23379,5 +23372,5 @@ #. 50000 #. -#. +#. #. #. @@ -23388,5 +23381,5 @@ #. 50000 #. -#. +#. #. #. @@ -23411,5 +23404,5 @@ #. 10000 #. -#. +#. #. #. @@ -23418,5 +23411,5 @@ #. 50000 #. -#. +#. #. #. @@ -23425,5 +23418,5 @@ #. 50000 #. -#. +#. #. #. @@ -23439,5 +23432,5 @@ #. 20000 #. -#. +#. #. #. @@ -23451,5 +23444,5 @@ #. 30000 #. -#. +#. #. #. @@ -23458,5 +23451,5 @@ #. 50000 #. -#. +#. #. #. @@ -23465,5 +23458,5 @@ #. 50000 #. -#. +#. #. #. @@ -23472,5 +23465,5 @@ #. 50000 #. -#. +#. #. #. @@ -23479,5 +23472,5 @@ #. 50000 #. -#. +#. #. #. @@ -23486,5 +23479,5 @@ #. 50000 #. -#. +#. #. #. @@ -23493,5 +23486,5 @@ #. 50000 #. -#. +#. #. #. @@ -23500,5 +23493,5 @@ #. 50000 #. -#. +#. #. #. @@ -23507,5 +23500,5 @@ #. 50000 #. -#. +#. #. #. @@ -23514,5 +23507,5 @@ #. 50000 #. -#. +#. #. #. @@ -23521,5 +23514,5 @@ #. 50000 #. -#. +#. #. #. @@ -23528,5 +23521,5 @@ #. 50000 #. -#. +#. #. #. @@ -23535,5 +23528,5 @@ #. 50000 #. -#. +#. #. #. @@ -23542,5 +23535,5 @@ #. 50000 #. -#. +#. #. #. @@ -23549,5 +23542,5 @@ #. 50000 #. -#. +#. #. #. @@ -23718,7 +23711,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23732,5 +23725,5 @@ #. 40000 #. -#. +#. #. #. @@ -23740,7 +23733,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23750,5 +23743,5 @@ #. 50000 #. -#. +#. #. #. @@ -23758,5 +23751,5 @@ #. 50000 #. -#. +#. #. #. @@ -23766,5 +23759,5 @@ #. 50000 #. -#. +#. #. #. @@ -23774,5 +23767,5 @@ #. 50000 #. -#. +#. #. #. @@ -23788,5 +23781,5 @@ #. 10000 #. -#. +#. #. #. @@ -23796,5 +23789,5 @@ #. 50000 #. -#. +#. #. #. @@ -23804,5 +23797,5 @@ #. 50000 #. -#. +#. #. #. @@ -23812,5 +23805,5 @@ #. 50000 #. -#. +#. #. #. @@ -23820,5 +23813,5 @@ #. 50000 #. -#. +#. #. #. @@ -23828,5 +23821,5 @@ #. 50000 #. -#. +#. #. #. @@ -23836,5 +23829,5 @@ #. 50000 #. -#. +#. #. #. @@ -23853,5 +23846,5 @@ #. 50000 #. -#. +#. #. #. @@ -23860,5 +23853,5 @@ #. 50000 #. -#. +#. #. #. @@ -23872,5 +23865,5 @@ #. 50000 #. -#. +#. #. #. @@ -23884,5 +23877,5 @@ #. 50000 #. -#. +#. #. #. @@ -23891,5 +23884,5 @@ #. 50000 #. -#. +#. #. #. @@ -23903,5 +23896,5 @@ #. 50000 #. -#. +#. #. #. @@ -23916,5 +23909,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23929,5 +23922,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23941,5 +23934,5 @@ #. 50000 #. -#. +#. #. #. @@ -23953,5 +23946,5 @@ #. 50000 #. -#. +#. #. #. @@ -23960,5 +23953,5 @@ #. 50000 #. -#. +#. #. #. @@ -23967,5 +23960,5 @@ #. 50000 #. -#. +#. #. #. @@ -23979,5 +23972,5 @@ #. 50000 #. -#. +#. #. #. @@ -23987,5 +23980,5 @@ #. 50000 #. -#. +#. #. #. @@ -23994,5 +23987,5 @@ #. 50000 #. -#. +#. #. #. @@ -24001,5 +23994,5 @@ #. 50000 #. -#. +#. #. #. @@ -24008,5 +24001,5 @@ #. 50000 #. -#. +#. #. #. @@ -24016,5 +24009,5 @@ #. 50000 #. -#. +#. #. #. @@ -24025,5 +24018,5 @@ #. 50000 #. -#. +#. #. #. @@ -24033,7 +24026,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24043,5 +24036,5 @@ #. 50000 #. -#. +#. #. #. @@ -24051,5 +24044,5 @@ #. 50000 #. -#. +#. #. #. @@ -24059,5 +24052,5 @@ #. 50000 #. -#. +#. #. #. @@ -24068,5 +24061,5 @@ #. 50000 #. -#. +#. #. #. @@ -24076,5 +24069,5 @@ #. 50000 #. -#. +#. #. #. @@ -24084,5 +24077,5 @@ #. 50000 #. -#. +#. #. #. @@ -24092,5 +24085,5 @@ #. 50000 #. -#. +#. #. #. @@ -24100,5 +24093,5 @@ #. 50000 #. -#. +#. #. #. @@ -24108,5 +24101,5 @@ #. 50000 #. -#. +#. #. #. @@ -24116,5 +24109,5 @@ #. 50000 #. -#. +#. #. #. @@ -24124,5 +24117,5 @@ #. 50000 #. -#. +#. #. #. @@ -24132,5 +24125,5 @@ #. 50000 #. -#. +#. #. #. @@ -24153,7 +24146,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24163,5 +24156,5 @@ #. 50000 #. -#. +#. #. #. @@ -24170,5 +24163,5 @@ #. 50000 #. -#. +#. #. #. @@ -24178,5 +24171,5 @@ #. 50000 #. -#. +#. #. #. @@ -24185,5 +24178,5 @@ #. 50000 #. -#. +#. #. #. @@ -24193,5 +24186,5 @@ #. 50000 #. -#. +#. #. #. @@ -24201,5 +24194,5 @@ #. 50000 #. -#. +#. #. #. @@ -24215,5 +24208,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24224,5 +24217,5 @@ #. 50000 #. -#. +#. #. #. @@ -24241,5 +24234,5 @@ #. 50000 #. -#. +#. #. #. @@ -24249,5 +24242,5 @@ #. 50000 #. -#. +#. #. #. @@ -24260,5 +24253,5 @@ #. 50000 #. -#. +#. #. #. @@ -24276,5 +24269,5 @@ #. 50000 #. -#. +#. #. #. @@ -24283,5 +24276,5 @@ #. 50000 #. -#. +#. #. #. @@ -24290,5 +24283,5 @@ #. 50000 #. -#. +#. #. #. @@ -24297,7 +24290,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24308,5 +24301,5 @@ #. 50000 #. -#. +#. #. #. @@ -24321,5 +24314,5 @@ #. 50000 #. -#. +#. #. #. @@ -24333,5 +24326,5 @@ #. 50000 #. -#. +#. #. #. @@ -24341,5 +24334,5 @@ #. 50000 #. -#. +#. #. #. @@ -24353,5 +24346,5 @@ #. 50000 #. -#. +#. #. #. @@ -24365,5 +24358,5 @@ #. 50000 #. -#. +#. #. #. @@ -24372,7 +24365,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24382,5 +24375,5 @@ #. 50000 #. -#. +#. #. #. @@ -24390,5 +24383,5 @@ #. 50000 #. -#. +#. #. #. @@ -24398,5 +24391,5 @@ #. 50000 #. -#. +#. #. #. @@ -24406,5 +24399,5 @@ #. 50000 #. -#. +#. #. #. @@ -24420,7 +24413,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24435,5 +24428,5 @@ #. 30000 #. -#. +#. #. #. @@ -24448,5 +24441,5 @@ #. 30000 #. -#. +#. #. #. @@ -24461,5 +24454,5 @@ #. 30000 #. -#. +#. #. #. @@ -24474,5 +24467,5 @@ #. 30000 #. -#. +#. #. #. @@ -24487,5 +24480,5 @@ #. 30000 #. -#. +#. #. #. @@ -24500,7 +24493,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24510,5 +24503,5 @@ #. 50000 #. -#. +#. #. #. @@ -24517,5 +24510,5 @@ #. 50000 #. -#. +#. #. #. @@ -24525,5 +24518,5 @@ #. 50000 #. -#. +#. #. #. @@ -24533,5 +24526,5 @@ #. 50000 #. -#. +#. #. #. @@ -24541,5 +24534,5 @@ #. 50000 #. -#. +#. #. #. @@ -24549,5 +24542,5 @@ #. 50000 #. -#. +#. #. #. @@ -24557,5 +24550,5 @@ #. 50000 #. -#. +#. #. #. @@ -24565,5 +24558,5 @@ #. 50000 #. -#. +#. #. #. @@ -24573,5 +24566,5 @@ #. 50000 #. -#. +#. #. #. @@ -24581,5 +24574,5 @@ #. 50000 #. -#. +#. #. #. @@ -24589,5 +24582,5 @@ #. 50000 #. -#. +#. #. #. @@ -24597,5 +24590,5 @@ #. 50000 #. -#. +#. #. #. @@ -24605,5 +24598,5 @@ #. 50000 #. -#. +#. #. #. @@ -24623,5 +24616,5 @@ #. 50000 #. -#. +#. #. #. @@ -24636,5 +24629,5 @@ #. 50000 #. -#. +#. #. #. @@ -24647,7 +24640,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24657,5 +24650,5 @@ #. 50000 #. -#. +#. #. #. @@ -24665,5 +24658,5 @@ #. 50000 #. -#. +#. #. #. @@ -24673,5 +24666,5 @@ #. 50000 #. -#. +#. #. #. @@ -24681,5 +24674,5 @@ #. 50000 #. -#. +#. #. #. @@ -24689,5 +24682,5 @@ #. 50000 #. -#. +#. #. #. @@ -24697,5 +24690,5 @@ #. 50000 #. -#. +#. #. #. @@ -24705,5 +24698,5 @@ #. 50000 #. -#. +#. #. #. @@ -24713,5 +24706,5 @@ #. 50000 #. -#. +#. #. #. @@ -24721,5 +24714,5 @@ #. 50000 #. -#. +#. #. #. @@ -24729,5 +24722,5 @@ #. 50000 #. -#. +#. #. #. @@ -24737,5 +24730,5 @@ #. 50000 #. -#. +#. #. #. @@ -24745,5 +24738,5 @@ #. 50000 #. -#. +#. #. #. @@ -24753,5 +24746,5 @@ #. 50000 #. -#. +#. #. #. @@ -24761,5 +24754,5 @@ #. 50000 #. -#. +#. #. #. @@ -24780,5 +24773,5 @@ #. 50000 #. -#. +#. #. #. @@ -24792,7 +24785,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24802,5 +24795,5 @@ #. 50000 #. -#. +#. #. #. @@ -24810,5 +24803,5 @@ #. 50000 #. -#. +#. #. #. @@ -24818,5 +24811,5 @@ #. 50000 #. -#. +#. #. #. @@ -24826,5 +24819,5 @@ #. 50000 #. -#. +#. #. #. @@ -24834,5 +24827,5 @@ #. 50000 #. -#. +#. #. #. @@ -24842,5 +24835,5 @@ #. 50000 #. -#. +#. #. #. @@ -24850,5 +24843,5 @@ #. 50000 #. -#. +#. #. #. @@ -24865,5 +24858,5 @@ #. 50000 #. -#. +#. #. #. @@ -24873,5 +24866,5 @@ #. 50000 #. -#. +#. #. #. @@ -24881,5 +24874,5 @@ #. 50000 #. -#. +#. #. #. @@ -24889,5 +24882,5 @@ #. 50000 #. -#. +#. #. #. @@ -24897,5 +24890,5 @@ #. 50000 #. -#. +#. #. #. @@ -24905,5 +24898,5 @@ #. 50000 #. -#. +#. #. #. @@ -24913,5 +24906,5 @@ #. 50000 #. -#. +#. #. #. @@ -24921,5 +24914,5 @@ #. 50000 #. -#. +#. #. #. @@ -24929,5 +24922,5 @@ #. 50000 #. -#. +#. #. #. @@ -24937,5 +24930,5 @@ #. 50000 #. -#. +#. #. #. @@ -24945,5 +24938,5 @@ #. 50000 #. -#. +#. #. #. @@ -24953,5 +24946,5 @@ #. 50000 #. -#. +#. #. #. @@ -24970,5 +24963,5 @@ #. 50000 #. -#. +#. #. #. @@ -24978,5 +24971,5 @@ #. 50000 #. -#. +#. #. #. @@ -24985,5 +24978,5 @@ #. 50000 #. -#. +#. #. #. @@ -24993,5 +24986,5 @@ #. 50000 #. -#. +#. #. #. @@ -25001,5 +24994,5 @@ #. 50000 #. -#. +#. #. #. @@ -25009,5 +25002,5 @@ #. 50000 #. -#. +#. #. #. @@ -25016,5 +25009,5 @@ #. 50000 #. -#. +#. #. #. @@ -25024,5 +25017,5 @@ #. 50000 #. -#. +#. #. #. @@ -25032,5 +25025,5 @@ #. 50000 #. -#. +#. #. #. @@ -25040,5 +25033,5 @@ #. 50000 #. -#. +#. #. #. @@ -25048,5 +25041,5 @@ #. 50000 #. -#. +#. #. #. @@ -25055,5 +25048,5 @@ #. 50000 #. -#. +#. #. #. @@ -25062,5 +25055,5 @@ #. 50000 #. -#. +#. #. #. @@ -25069,5 +25062,5 @@ #. 50000 #. -#. +#. #. #. @@ -25076,5 +25069,5 @@ #. 50000 #. -#. +#. #. #. @@ -25083,5 +25076,5 @@ #. 50000 #. -#. +#. #. #. @@ -25090,5 +25083,5 @@ #. 50000 #. -#. +#. #. #. @@ -25097,5 +25090,5 @@ #. 50000 #. -#. +#. #. #. @@ -25104,5 +25097,5 @@ #. 50000 #. -#. +#. #. #. @@ -25111,5 +25104,5 @@ #. 50000 #. -#. +#. #. #. @@ -25118,5 +25111,5 @@ #. 50000 #. -#. +#. #. #. @@ -25125,5 +25118,5 @@ #. 50000 #. -#. +#. #. #. @@ -25132,5 +25125,5 @@ #. 50000 #. -#. +#. #. #. @@ -25139,5 +25132,5 @@ #. 50000 #. -#. +#. #. #. @@ -25147,5 +25140,5 @@ #. 50000 #. -#. +#. #. #. @@ -25155,5 +25148,5 @@ #. 50000 #. -#. +#. #. #. @@ -25163,5 +25156,5 @@ #. 50000 #. -#. +#. #. #. @@ -25171,5 +25164,5 @@ #. 50000 #. -#. +#. #. #. @@ -25179,5 +25172,5 @@ #. 50000 #. -#. +#. #. #. @@ -25187,5 +25180,5 @@ #. 50000 #. -#. +#. #. #. @@ -25195,5 +25188,5 @@ #. 50000 #. -#. +#. #. #. @@ -25203,5 +25196,5 @@ #. 50000 #. -#. +#. #. #. @@ -25211,5 +25204,5 @@ #. 50000 #. -#. +#. #. #. @@ -25220,5 +25213,5 @@ #. 50000 #. -#. +#. #. #. @@ -25228,5 +25221,5 @@ #. 50000 #. -#. +#. #. #. @@ -25236,5 +25229,5 @@ #. 50000 #. -#. +#. #. #. @@ -25244,5 +25237,5 @@ #. 50000 #. -#. +#. #. #. @@ -25252,5 +25245,5 @@ #. 50000 #. -#. +#. #. #. @@ -25260,5 +25253,5 @@ #. 50000 #. -#. +#. #. #. @@ -25268,5 +25261,5 @@ #. 50000 #. -#. +#. #. #. @@ -25276,5 +25269,5 @@ #. 50000 #. -#. +#. #. #. @@ -25284,5 +25277,5 @@ #. 50000 #. -#. +#. #. #. @@ -25292,5 +25285,5 @@ #. 50000 #. -#. +#. #. #. @@ -25300,5 +25293,5 @@ #. 50000 #. -#. +#. #. #. @@ -25308,5 +25301,5 @@ #. 50000 #. -#. +#. #. #. @@ -25316,5 +25309,5 @@ #. 50000 #. -#. +#. #. #. @@ -25324,5 +25317,5 @@ #. 50000 #. -#. +#. #. #. @@ -25332,5 +25325,5 @@ #. 50000 #. -#. +#. #. #. @@ -25340,5 +25333,5 @@ #. 50000 #. -#. +#. #. #. @@ -25348,5 +25341,5 @@ #. 50000 #. -#. +#. #. #. @@ -25356,5 +25349,5 @@ #. 50000 #. -#. +#. #. #. @@ -25364,5 +25357,5 @@ #. 50000 #. -#. +#. #. #. @@ -25371,5 +25364,5 @@ #. 50000 #. -#. +#. #. #. @@ -25401,5 +25394,5 @@ #. 50000 #. -#. +#. #. #. @@ -25409,5 +25402,5 @@ #. 50000 #. -#. +#. #. #. @@ -25417,7 +25410,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25432,5 +25425,5 @@ #. 50000 #. -#. +#. #. #. @@ -25440,5 +25433,5 @@ #. 50000 #. -#. +#. #. #. @@ -25448,5 +25441,5 @@ #. 50000 #. -#. +#. #. #. @@ -25456,5 +25449,5 @@ #. 50000 #. -#. +#. #. #. @@ -25464,5 +25457,5 @@ #. 50000 #. -#. +#. #. #. @@ -25472,5 +25465,5 @@ #. 50000 #. -#. +#. #. #. @@ -25480,5 +25473,5 @@ #. 50000 #. -#. +#. #. #. @@ -25494,7 +25487,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25504,5 +25497,5 @@ #. 50000 #. -#. +#. #. #. @@ -25512,5 +25505,5 @@ #. 50000 #. -#. +#. #. #. @@ -25520,5 +25513,5 @@ #. 50000 #. -#. +#. #. #. @@ -25528,5 +25521,5 @@ #. 50000 #. -#. +#. #. #. @@ -25536,5 +25529,5 @@ #. 50000 #. -#. +#. #. #. @@ -25544,5 +25537,5 @@ #. 50000 #. -#. +#. #. #. @@ -25552,5 +25545,5 @@ #. 50000 #. -#. +#. #. #. @@ -25560,5 +25553,5 @@ #. 50000 #. -#. +#. #. #. @@ -25568,5 +25561,5 @@ #. 50000 #. -#. +#. #. #. @@ -25576,5 +25569,5 @@ #. 50000 #. -#. +#. #. #. @@ -25584,5 +25577,5 @@ #. 50000 #. -#. +#. #. #. @@ -25592,5 +25585,5 @@ #. 50000 #. -#. +#. #. #. @@ -25600,5 +25593,5 @@ #. 50000 #. -#. +#. #. #. @@ -25608,5 +25601,5 @@ #. 50000 #. -#. +#. #. #. @@ -25616,5 +25609,5 @@ #. 50000 #. -#. +#. #. #. @@ -25624,5 +25617,5 @@ #. 50000 #. -#. +#. #. #. @@ -25632,5 +25625,5 @@ #. 50000 #. -#. +#. #. #. @@ -25640,5 +25633,5 @@ #. 50000 #. -#. +#. #. #. @@ -25648,5 +25641,5 @@ #. 50000 #. -#. +#. #. #. @@ -25656,5 +25649,5 @@ #. 50000 #. -#. +#. #. #. @@ -25664,5 +25657,5 @@ #. 50000 #. -#. +#. #. #. @@ -25672,5 +25665,5 @@ #. 50000 #. -#. +#. #. #. @@ -25680,5 +25673,5 @@ #. 50000 #. -#. +#. #. #. @@ -25688,5 +25681,5 @@ #. 50000 #. -#. +#. #. #. @@ -25696,5 +25689,5 @@ #. 50000 #. -#. +#. #. #. @@ -25704,5 +25697,5 @@ #. 50000 #. -#. +#. #. #. @@ -25712,5 +25705,5 @@ #. 50000 #. -#. +#. #. #. @@ -25720,5 +25713,5 @@ #. 50000 #. -#. +#. #. #. @@ -25728,5 +25721,5 @@ #. 50000 #. -#. +#. #. #. @@ -25736,5 +25729,5 @@ #. 50000 #. -#. +#. #. #. @@ -25744,5 +25737,5 @@ #. 50000 #. -#. +#. #. #. @@ -25752,5 +25745,5 @@ #. 50000 #. -#. +#. #. #. @@ -25760,5 +25753,5 @@ #. 50000 #. -#. +#. #. #. @@ -25768,5 +25761,5 @@ #. 50000 #. -#. +#. #. #. @@ -25776,5 +25769,5 @@ #. 50000 #. -#. +#. #. #. @@ -25784,5 +25777,5 @@ #. 50000 #. -#. +#. #. #. @@ -25792,5 +25785,5 @@ #. 50000 #. -#. +#. #. #. @@ -25800,5 +25793,5 @@ #. 50000 #. -#. +#. #. #. @@ -25808,5 +25801,5 @@ #. 50000 #. -#. +#. #. #. @@ -25816,5 +25809,5 @@ #. 50000 #. -#. +#. #. #. @@ -25824,5 +25817,5 @@ #. 50000 #. -#. +#. #. #. @@ -25832,5 +25825,5 @@ #. 50000 #. -#. +#. #. #. @@ -25866,7 +25859,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25876,5 +25869,5 @@ #. 50000 #. -#. +#. #. #. @@ -25884,5 +25877,5 @@ #. 50000 #. -#. +#. #. #. @@ -25892,5 +25885,5 @@ #. 50000 #. -#. +#. #. #. @@ -25900,5 +25893,5 @@ #. 50000 #. -#. +#. #. #. @@ -25908,5 +25901,5 @@ #. 50000 #. -#. +#. #. #. @@ -25916,5 +25909,5 @@ #. 50000 #. -#. +#. #. #. @@ -25924,5 +25917,5 @@ #. 50000 #. -#. +#. #. #. @@ -25939,5 +25932,5 @@ #. 50000 #. -#. +#. #. #. @@ -25947,5 +25940,5 @@ #. 50000 #. -#. +#. #. #. @@ -25955,5 +25948,5 @@ #. 50000 #. -#. +#. #. #. @@ -25963,5 +25956,5 @@ #. 50000 #. -#. +#. #. #. @@ -25971,5 +25964,5 @@ #. 50000 #. -#. +#. #. #. @@ -25979,5 +25972,5 @@ #. 50000 #. -#. +#. #. #. @@ -25988,5 +25981,5 @@ #. 50000 #. -#. +#. #. #. @@ -25996,5 +25989,5 @@ #. 50000 #. -#. +#. #. #. @@ -26004,5 +25997,5 @@ #. 40000 #. -#. +#. #. #. @@ -26012,5 +26005,5 @@ #. 50000 #. -#. +#. #. #. @@ -26019,5 +26012,5 @@ #. 40000 #. -#. +#. #. #. @@ -26026,5 +26019,5 @@ #. 40000 #. -#. +#. #. #. @@ -26042,7 +26035,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26052,5 +26045,5 @@ #. 50000 #. -#. +#. #. #. @@ -26060,5 +26053,5 @@ #. 50000 #. -#. +#. #. #. @@ -26068,5 +26061,5 @@ #. 50000 #. -#. +#. #. #. @@ -26076,5 +26069,5 @@ #. 50000 #. -#. +#. #. #. @@ -26084,5 +26077,5 @@ #. 50000 #. -#. +#. #. #. @@ -26092,5 +26085,5 @@ #. 50000 #. -#. +#. #. #. @@ -26100,5 +26093,5 @@ #. 50000 #. -#. +#. #. #. @@ -26108,5 +26101,5 @@ #. 50000 #. -#. +#. #. #. @@ -26116,5 +26109,5 @@ #. 50000 #. -#. +#. #. #. @@ -26133,5 +26126,5 @@ #. 50000 #. -#. +#. #. #. @@ -26145,5 +26138,5 @@ #. 50000 #. -#. +#. #. #. @@ -26157,5 +26150,5 @@ #. 50000 #. -#. +#. #. #. @@ -26165,5 +26158,5 @@ #. 50000 #. -#. +#. #. #. @@ -26177,5 +26170,5 @@ #. 50000 #. -#. +#. #. #. @@ -26189,5 +26182,5 @@ #. 50000 #. -#. +#. #. #. @@ -26201,6 +26194,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26210,5 +26203,5 @@ #. 50000 #. -#. +#. #. #. @@ -26222,5 +26215,5 @@ #. 50000 #. -#. +#. #. #. @@ -26234,5 +26227,5 @@ #. 50000 #. -#. +#. #. #. @@ -26246,5 +26239,5 @@ #. 50000 #. -#. +#. #. #. @@ -26258,5 +26251,5 @@ #. 50000 #. -#. +#. #. #. @@ -26270,5 +26263,5 @@ #. 50000 #. -#. +#. #. #. @@ -26278,7 +26271,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26288,5 +26281,5 @@ #. 50000 #. -#. +#. #. #. @@ -26296,5 +26289,5 @@ #. 50000 #. -#. +#. #. #. @@ -26304,5 +26297,5 @@ #. 50000 #. -#. +#. #. #. @@ -26312,5 +26305,5 @@ #. 50000 #. -#. +#. #. #. @@ -26327,5 +26320,5 @@ #. 50000 #. -#. +#. #. #. @@ -26338,5 +26331,5 @@ #. 50000 #. -#. +#. #. #. @@ -26350,5 +26343,5 @@ #. 50000 #. -#. +#. #. #. @@ -26362,5 +26355,5 @@ #. 50000 #. -#. +#. #. #. @@ -26374,5 +26367,5 @@ #. 50000 #. -#. +#. #. #. @@ -26383,5 +26376,5 @@ #. 50000 #. -#. +#. #. #. @@ -26391,5 +26384,5 @@ #. 50000 #. -#. +#. #. #. @@ -26399,5 +26392,5 @@ #. 50000 #. -#. +#. #. #. @@ -26407,5 +26400,5 @@ #. 50000 #. -#. +#. #. #. @@ -26415,5 +26408,5 @@ #. 50000 #. -#. +#. #. #. @@ -26430,5 +26423,5 @@ #. 50000 #. -#. +#. #. #. @@ -26442,5 +26435,5 @@ #. 50000 #. -#. +#. #. #. @@ -26454,5 +26447,5 @@ #. 50000 #. -#. +#. #. #. @@ -26466,5 +26459,5 @@ #. 50000 #. -#. +#. #. #. @@ -26478,5 +26471,5 @@ #. 50000 #. -#. +#. #. #. @@ -26490,5 +26483,5 @@ #. 50000 #. -#. +#. #. #. @@ -26497,7 +26490,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26507,5 +26500,5 @@ #. 50000 #. -#. +#. #. #. @@ -26515,5 +26508,5 @@ #. 50000 #. -#. +#. #. #. @@ -26523,5 +26516,5 @@ #. 50000 #. -#. +#. #. #. @@ -26531,5 +26524,5 @@ #. 50000 #. -#. +#. #. #. @@ -26539,5 +26532,5 @@ #. 50000 #. -#. +#. #. #. @@ -26547,5 +26540,5 @@ #. 50000 #. -#. +#. #. #. @@ -26555,5 +26548,5 @@ #. 50000 #. -#. +#. #. #. @@ -26570,7 +26563,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26580,5 +26573,5 @@ #. 50000 #. -#. +#. #. #. @@ -26588,5 +26581,5 @@ #. 50000 #. -#. +#. #. #. @@ -26596,5 +26589,5 @@ #. 50000 #. -#. +#. #. #. @@ -26604,5 +26597,5 @@ #. 50000 #. -#. +#. #. #. @@ -26618,5 +26611,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26665,5 +26658,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26673,5 +26666,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26681,5 +26674,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26689,5 +26682,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26697,5 +26690,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26705,5 +26698,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26713,5 +26706,5 @@ #. 50000 #. -#. +#. #. #. @@ -26721,5 +26714,5 @@ #. 50000 #. -#. +#. #. #. @@ -26729,5 +26722,5 @@ #. 50000 #. -#. +#. #. #. @@ -26737,5 +26730,5 @@ #. 50000 #. -#. +#. #. #. @@ -26745,5 +26738,5 @@ #. 50000 #. -#. +#. #. #. @@ -26753,5 +26746,5 @@ #. 50000 #. -#. +#. #. #. @@ -26771,5 +26764,5 @@ #. 50000 #. -#. +#. #. #. @@ -26778,5 +26771,5 @@ #. 50000 #. -#. +#. #. #. @@ -26785,5 +26778,5 @@ #. 50000 #. -#. +#. #. #. @@ -26792,5 +26785,5 @@ #. 40000 #. -#. +#. #. #. @@ -26799,5 +26792,5 @@ #. 40000 #. -#. +#. #. #. @@ -26806,5 +26799,5 @@ #. 40000 #. -#. +#. #. #. @@ -26899,5 +26892,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -26905,28 +26898,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 @@ -27041,5 +27034,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -27052,5 +27045,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27075,6 +27068,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27083,6 +27076,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27097,6 +27090,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 @@ -27110,6 +27103,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 @@ -27129,6 +27122,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27152,6 +27145,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 @@ -27163,4 +27156,64 @@ msgid "Sicily - Italy" msgstr "" + +#~ msgid "Images for {0}" +#~ msgstr "{0} için görüntüler" + +#~ msgid "Read GPX..." +#~ msgstr "GPX Oku..." + +#~ msgid "No time for point {0} x {1}" +#~ msgstr "Noktalrı için {0} x {1} zaman yok" + +#~ msgid "Cannot read time \"{0}\" from point {1} x {2}" +#~ msgstr "Zaman şu noktalar \"{0}\" {1} x {2} için okunamadı" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "Zaman damgası okunabilen bir görüntü bulunamadı." + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS başlangıç: {0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS bitiş: {0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "şu anki delta: {0}s" + +#~ msgid "timezone difference: " +#~ msgstr "zaman dilimi farkı: " + +#~ msgid "{0} within the track." +#~ msgstr "{0} izde var." + +#~ msgid "Sync clock" +#~ msgstr "Saati eşle" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "\"{0}\" dosyasındaki zaman ayrıştırılamadı." + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "EXIF zamanı \"{0}\" dosyasında yok." + +#~ msgid "Image" +#~ msgstr "Görüntü" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "Gösterilecek tarihi giriniz (ay/gün/yıl saat:dakika:saniye)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "GPS ünitesi zamandilimi (resim farkı)" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "Girilen zaman ayrıştırılamadı." + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - Geotagged imajlar" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "AgPifoJ ile görüntü aç..." + +#~ msgid "osmarender options" +#~ msgstr "osmarender seçenekleri" #~ msgid "" @@ -27169,5 +27222,4 @@ #~ msgstr "Eklenti kaldırılamıyor, Lütfen JOSM u edindiğiniz yere danışın" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "Lütfen {0} 'daki problemi bildiriniz" @@ -27177,6 +27229,6 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "" #~ "Hatayı bildirmeden önce JOSM'un ve eklentilerin son versiyonunu edinmeyi " @@ -27190,5 +27242,6 @@ #~ "some time." #~ msgstr "" -#~ "Server bir hata bildirdi. Küçük bir alan deneyiniz veya daha sonra yapınız." +#~ "Server bir hata bildirdi. Küçük bir alan deneyiniz veya daha sonra " +#~ "yapınız." #~ msgid "Unknown version" @@ -27220,7 +27273,4 @@ #~ msgstr "İpucu: Bazı değişiklikler server'a yükleme yapıldıktan sonra geldi." -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "lütfen ilk olarak istenilen koordinatı giriniz." - #~ msgid "Select a bookmark first." #~ msgstr "İlk olarak sık kullanılanlardan bir yer seçiniz." @@ -27229,9 +27279,7 @@ #~ msgstr "Fare veya Ctrl+ok tuşları ile /./ zoom ve pan yapabilirsin." -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "''{1}'' gurubu için ''{0}'' kullan" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "''{0}'' ı kullan" @@ -27271,9 +27319,8 @@ #~ msgid "" -#~ "Revert the state of all currently selected objects to the version selected " -#~ "in the history list." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "Seçili objelerin durumlarını geçmiş listesinde seçili olana çevir" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "Yazarlar: {0}" @@ -27282,5 +27329,4 @@ #~ msgstr "Çelişkileri Birleştir." -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "Çeşişkiler: {0}" @@ -27297,6 +27343,6 @@ #~ msgid "" #~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded in " -#~ "the URL.
Do not use a valuable Password." +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" #~ "UYARI: şifre konfigürasyon dosyasında düz metin olarak " @@ -27311,6 +27357,6 @@ #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." #~ msgstr "" -#~ "Etiketleme ayarları kaynakları dosyası, yardım " -#~ "için:http://josm.openstreetmap.de/wiki/TaggingPresets." +#~ "Etiketleme ayarları kaynakları dosyası, yardım için:http://josm." +#~ "openstreetmap.de/wiki/TaggingPresets." #~ msgid "Add a new tagging preset source to the list." @@ -27323,5 +27369,4 @@ #~ msgstr "site-josm.xml veya Wiki Pages ekle." -#, java-format #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -27338,13 +27383,7 @@ #~ msgstr "Eklentiler zaten mevcut" -#, java-format -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Eklentinin silinmesinde hata: {0}" - -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "Tercihler klasörü açılamıyor: {0}" -#, java-format #~ msgid "{0} object has conflicts:" #~ msgid_plural "{0} objects have conflicts:" @@ -27363,11 +27402,10 @@ #~ msgstr "Dosya bulunamadı" -#, java-format #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Eklenti indirilemedi: {0} ve {1}" -#, java-format #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded automatically." +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" #~ "Eklenti {0} göründüğü kadarıyla linki bozuk veya otomatik indirilemiyor ." @@ -27376,8 +27414,4 @@ #~ msgstr "Taşı" -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "Sil {1} {0}" - #~ msgid "Conflicting relation" #~ msgstr "İlişkilerde Karışıklık" @@ -27398,5 +27432,4 @@ #~ msgstr "farklı" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27428,6 +27461,6 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" #~ "Seçili yollar farklı ilişkilere sahip, buna rağmen birleştirmek " @@ -27453,9 +27486,9 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "" -#~ "Program Hatası: tabakalar için durumlar kontrol edilemediLütfen hata olarak " -#~ "bildiriniz" +#~ "Program Hatası: tabakalar için durumlar kontrol edilemediLütfen hata " +#~ "olarak bildiriniz" #~ msgid "No document open so nothing to save." @@ -27510,5 +27543,4 @@ #~ msgstr "meta veri yüklemesinde hata" -#, java-format #~ msgid "requested: {0}" #~ msgstr "istendi: {0}" @@ -27547,5 +27579,4 @@ #~ msgstr "Metacarta Map Rectifier imaj id" -#, java-format #~ msgid "rectifier id={0}" #~ msgstr "rectifier id={0}" @@ -27561,6 +27592,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -27577,6 +27608,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example,replacing 73 with your image id: \n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -27585,6 +27616,6 @@ #~ "use." #~ msgstr "" -#~ "WMS tercihler sekmesinden şu ayarları yapabilirsiniz. Veri ekle, sil, düzelt " -#~ "gibi - menuler ekranında görünecektir.\n" +#~ "WMS tercihler sekmesinden şu ayarları yapabilirsiniz. Veri ekle, sil, " +#~ "düzelt gibi - menuler ekranında görünecektir.\n" #~ "\n" #~ "Aynı zamanda aşağıdaki şemayı kullanarak, ileri tercihler kısmındada " @@ -27595,13 +27626,14 @@ #~ "\n" #~ "Tam WMS link formatı örnek (landsat)\n" -#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&style" -#~ "s=&srs=EPSG:4326&format=image/jpeg\n" +#~ "http://onearth.jpl.nasa.gov/wms.cgi?" +#~ "request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/" +#~ "jpeg\n" #~ "\n" -#~ "Metacarta Map Rectifier için http://labs.metacarta.com/rectifier/ , sadece " -#~ "gerekli 'id' ye ihtiyacınız var.\n" +#~ "Metacarta Map Rectifier için http://labs.metacarta.com/rectifier/ , " +#~ "sadece gerekli 'id' ye ihtiyacınız var.\n" #~ "Metacarta Map Rectifier menusunu eklemek için şu linki örnek olarak, 73 ü " #~ "sizin 'id' niz ile değiştirin:\n" -#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73&srs=EPSG:4326&Service=WMS&V" -#~ "ersion=1.1.0&Request=GetMap&\n" +#~ "http://labs.metacarta.com/rectifier/wms.cgi?" +#~ "id=73&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&\n" #~ "format=image/png" @@ -27657,5 +27689,4 @@ #~ msgstr "Para Değişim" -#, java-format #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "eklenti JOSM’un güncellemesini gerektiriyor: {0}." @@ -27682,5 +27713,4 @@ #~ msgstr "Sadece JOSM Online Yardım dosyalaları düzenlenebilir" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "Sayfa {0} yüklerken hata oluştu" @@ -27693,6 +27723,6 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "" #~ "Seçili noktaların farklı üyelikleri var. Ona rağmen birleştirmek istiyor " @@ -27705,13 +27735,11 @@ #~ msgstr "Sadece bir nokta seçili" -#, java-format #~ msgid "Help page missing. Create it in English." #~ msgstr "Yardım sayfası yok. English olarak oluştur." -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." +#~ "Help page missing. Create it in English or your language." #~ msgstr "" -#~ "Yardım sayfası yok. English ya da türkçe olarak oluştur." +#~ "Yardım sayfası yok. English ya da türkçe olarak oluştur." Index: /applications/editors/josm/i18n/po/zh_TW.po =================================================================== --- /applications/editors/josm/i18n/po/zh_TW.po (revision 18974) +++ /applications/editors/josm/i18n/po/zh_TW.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:09+0000\n" +"POT-Creation-Date: 2009-12-06 14:57+0100\n" +"PO-Revision-Date: 2009-12-02 04:34+0000\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Traditional Chinese\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-11-29 21:04+0000\n" +"X-Launchpad-Export-Date: 2009-12-06 13:18+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: zh_TW\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 "來源圖層
''{0}''
中沒有任何圖層可合併。" @@ -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 "經度" @@ -440,17 +435,17 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225 msgid "Please enter a valid latitude in the range -90..90" -msgstr "" +msgstr "請輸入有效的緯度範圍 -90..90" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228 msgid "Please enter a latitude in the range -90..90" -msgstr "" +msgstr "請輸入緯度範圍 -90..90" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236 msgid "Please enter a valid longitude in the range -180..180" -msgstr "" +msgstr "請輸入有效的經度範圍 -180..180" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239 msgid "Please enter a longitude in the range -180..180" -msgstr "" +msgstr "請輸入經度範圍 -180..180" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275 @@ -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 @@ -473,9 +468,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276 msgid "Close the dialog and create a new node" -msgstr "" +msgstr "關閉此對話盒並建立新的節點" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289 msgid "Close the dialog, don't create a new node" -msgstr "" +msgstr "關閉此對話盒，不要建立新的節點" #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 @@ -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}" @@ -684,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 "請選擇至少兩個以上的路徑來合併" @@ -706,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 " @@ -729,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 @@ -803,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" @@ -825,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 @@ -853,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 "重製" @@ -908,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 @@ -917,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 @@ -928,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 @@ -948,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 @@ -972,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 @@ -1018,4 +1016,103 @@ msgstr "顯示 OSM 路徑、節點或關係的物件資訊。" +#: ../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 "「{0}」尚未封閉因此不能連結。" + +#: ../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 "" +"選取的路徑有在已下載資料區域之外的節點。\n" +"這樣可能會造成意外刪除某些節點。\n" +"確定要繼續嗎？" + +#: ../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 @@ -1035,4 +1132,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 "您也可以貼上 www.openstreetmap.org 的 URL" + +#: ../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 "URL" + +#: ../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" @@ -1043,26 +1181,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 "" @@ -1070,5 +1208,5 @@ msgstr "不能合併節點：必須刪除仍在使用中的路徑「{0}」。" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231 #, java-format msgid "Merge {0} nodes" @@ -1438,6 +1576,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 "顯示有與程式錯誤相關資訊的狀態報告" @@ -1457,9 +1594,39 @@ #: ../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] "選擇區域包含 {0} 條路徑。確定要全部簡化？" + +#: ../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] "簡化路徑（移除 {0} 個節點）" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 @@ -1521,6 +1688,6 @@ "this and correct it when necessary." msgstr "" -"將關係成員複製到所有的新路徑。
您應該在You should verify this and correct it when " -"necessary." +"將關係成員複製到所有的新路徑。
您應該在You should verify this and " +"correct it when necessary." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383 @@ -1581,6 +1748,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 "* 一個用於多條路徑或用於那些路徑之一的節點，或" @@ -1659,54 +1825,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 "在目前的資料組合中找不到 id {0} 的物件" -#: ../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:127 +#: ../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:128 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 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 "將使用中圖層的所有變更上傳至 OSM 伺服器" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 #, java-format msgid "" @@ -1715,35 +1881,35 @@ msgstr "在圖層「{0}」中有未解決的衝突。
您必須先解決它們。" -#: ../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 "只同步節點 {0}" -#: ../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 "只同步路徑 {0}" -#: ../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 "只同步關係 {0}" -#: ../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 "" @@ -1751,30 +1917,29 @@ "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 "" -"上傳失敗，因為伺服器已有您的節點、路徑或關係
的新版本。

請按{0}將整個本地端資料組與伺服器同步。
按{1}則會放棄並繼續編輯。
" - -#: ../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 "" +"上傳失敗，因為伺服器已有您的節點、路徑或關係
的新版" +"本。

請按{0}將整個本地端資料組與伺服器同步。
按" +"{1}則會放棄並繼續編輯。
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332 #, java-format msgid "" @@ -1783,25 +1948,25 @@ "again with a new or an existing open changeset." msgstr "" -"上傳 失敗，因為您使用的
變更組合 {0} 已經在 {1} " -"被關閉了。
請以新的或已開啟的變更組合再上傳一次。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 +"上傳 失敗，因為您使用的
變更組合 {0} 已經在 {1} 被" +"關閉了。
請以新的或已開啟的變更組合再上傳一次。" + +#: ../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 "點選以下載節點 {0} 的所有上層路徑" -#: ../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 "" @@ -1811,19 +1976,19 @@ "conflicts which you can resolve in the Conflict Resolution Dialog." msgstr "" -"上傳 已失敗，因為您嘗試刪除的節點 {0} 仍被路徑 {1} 使用中。

請點選 " -"{2} 以下載節點 {0} 的所有上層路徑。
如果有需要 JOSM " -"會建立衝突項目讓您可以在衝突解決對話盒中處理它。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 +"上傳 已失敗，因為您嘗試刪除的節點 {0} 仍被路徑 {1} 使" +"用中。

請點選 {2} 以下載節點 {0} 的所有上層路徑。
" +"如果有需要 JOSM 會建立衝突項目讓您可以在衝突解決對話盒中處理它。" + +#: ../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 "警告：錯誤標頭「{0}」與預期的模式不符" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525 msgid "Updating primitive" msgstr "正在更新原型" @@ -1835,46 +2000,46 @@ #. 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 "" "Warning: object ''{0}'' is already deleted on the server. Skipping this " "object and retrying to upload." -msgstr "警告：物件「{0}」已經在伺服器端被刪除了。現在略過這個物件並重新嘗試上傳。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 +msgstr "" +"警告：物件「{0}」已經在伺服器端被刪除了。現在略過這個物件並重新嘗試上傳。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "物件「{0}」已經被刪除。在上傳中略過此物件。" -#: ../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 "正在上傳 {0} 個物件..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 -#, java-format -msgid "" -"Ignoring caught exception because upload is canceled. Exception is: {0}" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650 +#, java-format +msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" msgstr "忽略捕捉到的例外，因為上傳已被取消。例外為：{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45 +#: ../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 "將目前的選擇區域上傳至 OSM 伺服器。" -#: ../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 "正在讀取「{0}」的上層項目" -#: ../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 "正在檢查在本地端資料組合中被刪除的上層項目" @@ -2038,10 +2203,11 @@ "deleted on the server. If you later try to delete or
update them the " "server is likely to report a
conflict.

Click {1} " -"to check the state of these primitives
on the server.
Click " -"{2} to ignore.
" -msgstr "" -"在您的本地端資料組合中有 {0} " -"個原型可能在
伺服器上被刪除了。如果您稍後想刪除或更新它們，
伺服器可能會回報發生
衝突。

點選{1} 以檢查這些原型在伺服器上
的狀態。
點選 {2} 則會略過它。
" +"to check the state of these primitives
on the server.
Click {2}" +" to ignore.
" +msgstr "" +"在您的本地端資料組合中有 {0} 個原型可能在
伺服器上被刪除了。如果您稍" +"後想刪除或更新它們，
伺服器可能會回報發生
衝突。

點選{1}" +" 以檢查這些原型在伺服器上
的狀態。
點選 {2} " +"則會略過它。
" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183 @@ -2085,5 +2251,7 @@ "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " "when deleting a way. Ctrl: delete referring objects." -msgstr "點選可進行刪除。Shift：刪除路徑區段。Alt：刪除路徑時不要刪除未使用的節點。Ctrl：刪除參考的物件。" +msgstr "" +"點選可進行刪除。Shift：刪除路徑區段。Alt：刪除路徑時不要刪除未使用的節點。" +"Ctrl：刪除參考的物件。" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 @@ -2107,38 +2275,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." @@ -2146,14 +2314,14 @@ msgstr[0] "插入新的節點到{0} 路徑中。" -#: ../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 "結束繪製。" @@ -2188,7 +2356,8 @@ #: ../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." -msgstr "將播放開頭拖曳並放至要播放音效的軌跡旁；按 SHIFT+釋放就會從那一點同步化音效。" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"將播放開頭拖曳並放至要播放音效的軌跡旁；按 SHIFT+釋放就會從那一點同步化音效。" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 @@ -2254,5 +2423,7 @@ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" "Ctrl to rotate selected; or change selection" -msgstr "以拖曳移動物件；按 Shift 加入選擇區域(Ctrl 可切換)；Shift-Ctrl 會旋轉選取的；或改變選擇區域" +msgstr "" +"以拖曳移動物件；按 Shift 加入選擇區域(Ctrl 可切換)；Shift-Ctrl 會旋轉選取的；" +"或改變選擇區域" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 @@ -2270,5 +2441,7 @@ "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " "move zoom with right button" -msgstr "拖曳或 Ctrl+. 或 Ctrl+, 來縮放；Ctrl+up, left, down, right 可移動；按右鍵可移動縮放" +msgstr "" +"拖曳或 Ctrl+. 或 Ctrl+, 來縮放；Ctrl+up, left, down, right 可移動；按右鍵可移" +"動縮放" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 @@ -2283,5 +2456,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." @@ -2341,6 +2514,6 @@ "type=, *=*, *=" msgstr "" -"type=* - 設定鍵「type」為任何數值。也可以使用 " -"*=value、type=、*=*、*=" +"type=* - 設定鍵「type」為任何數值。也可以使用 *=value、" +"type=、*=*、*=" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 @@ -2360,5 +2533,6 @@ "type: - type of the object (node, way, relation)" msgstr "" -"類型： - 物件的類型 (節點(node), 路徑(way), 關係(relation))" +"類型： - 物件的類型 (節點(node), 路徑(way), 關係" +"(relation))" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 @@ -2367,12 +2541,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 "id:... - 以此為 ID 的物件 (0 為新的物件)" -#: ../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-" @@ -2380,43 +2559,43 @@ msgstr "tags:... - 以此數字為標籤的物件 (tags:count 或 tags:min-max)" -#: ../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 "child expr - 所有物件的子項符合正規表示式的" -#: ../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 "parent expr - 所有物件父項符合正規表示式的" -#: ../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 "使用 | 或 OR 做邏輯或運算" -#: ../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 @@ -2426,55 +2605,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 "搜尋「{0}」的結果沒有任何項目可加入選擇區域" -#: ../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 "搜尋「{0}」的結果沒有任何項目可自選擇區域移除" -#: ../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 "在選擇區域中搜尋不到「{0}」" -#: ../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 "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 #, java-format msgid "" @@ -2487,58 +2666,62 @@ "{2}" -#: ../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 "使用標籤(tag)運算子時設定鍵不能空白。使用範例：key=value" -#: ../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 "樣式語法錯誤：在 {1} 中的樣式 {0} 是無效的！" -#: ../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 "不明的原型類型：{0}。允許的數值為 node、 way 或 relation" -#: ../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 "未預期的記號：{0}" -#: ../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 "沒有 or 所需的引數。" -#: ../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 "沒有 not 所需的引數。" -#: ../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 "" "Incorrect value of tags operator: {0}. Tags operator expects number of tags " "or range, for example tags:1 or tags:2-5" -msgstr "標籤運算子的數值不正確：{0}。標籤運算子預期的是標籤的編號或一個範圍，例如 tags:1 或 tags:2-5" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 +msgstr "" +"標籤運算子的數值不正確：{0}。標籤運算子預期的是標籤的編號或一個範圍，例如 " +"tags:1 或 tags:2-5" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684 msgid "Wrong number of parameters for nodes operator." msgstr "給 nodes 運算子錯誤的參數數量。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686 #, java-format msgid "" "Incorrect value of nodes operator: {0}. Nodes operator expects number of " "nodes or range, for example nodes:10-20" -msgstr "nodes 運算子的數值錯誤：{0}。nodes 運算子應使用節點的數量或範圍，例如 nodes:10-20" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 +msgstr "" +"nodes 運算子的數值錯誤：{0}。nodes 運算子應使用節點的數量或範圍，例如 " +"nodes:10-20" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2589,6 +2772,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 "" @@ -2596,5 +2778,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 "" @@ -2729,5 +2911,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 "雙重衝突" @@ -2746,5 +2928,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 "" @@ -2763,19 +2946,19 @@ msgstr "不能未決定的衝突" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 +#: ../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 "參數「{0}」不能空白" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61 +#: ../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:107 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105 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" @@ -2783,5 +2966,5 @@ msgstr[0] "刪除 {0} 個物件" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182 #, java-format msgid "Delete {0} node" @@ -2789,5 +2972,5 @@ msgstr[0] "刪除 {0} 個節點" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 #, java-format msgid "Delete {0} way" @@ -2795,5 +2978,5 @@ msgstr[0] "刪除 {0} 個路徑" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 #, java-format msgid "Delete {0} relation" @@ -2803,13 +2986,15 @@ #. 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 "刪除動作確認" @@ -2826,15 +3011,15 @@ msgstr[0] "移動 {0} 個節點" -#: ../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 "清理的物件「{0}」" -#: ../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 "清理的 {0} 物件" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154 #, java-format msgid "" @@ -2843,5 +3028,5 @@ msgstr "警告：將清除路徑 {0}，因為其節點數已低於 2。目前為 {1}" -#: ../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}" @@ -2852,9 +3037,4 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "解決關係 {0} 的成員清單的衝突" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "無法取消指令「{0}」，因為圖層「{1}」已不存在" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -2932,9 +3112,11 @@ 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 " "its nodes are suggested in order to maintain data consistency." -msgstr "在反轉這條路徑時，為了維持資料的一致性，建議下列對該路徑的屬性與其節點的變更。" +msgstr "" +"在反轉這條路徑時，為了維持資料的一致性，建議下列對該路徑的屬性與其節點的變" +"更。" #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 @@ -3073,7 +3255,9 @@ #, java-format msgid "" -"Preferences file had errors.
Making backup of old one to " -"
{0}
and creating a new default preference file." -msgstr "偏好設定檔案有錯誤。
將舊的設定製作備份為
{0}
並建立新的預設偏好設定檔案。" +"Preferences file had errors.
Making backup of old one to
{0}" +"
and creating a new default preference file." +msgstr "" +"偏好設定檔案有錯誤。
將舊的設定製作備份為
{0}
並建立新的預設" +"偏好設定檔案。" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 @@ -3155,5 +3339,5 @@ #. * #. * the decimal format 999.999 -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15 msgid "Decimal Degrees" @@ -3162,5 +3346,5 @@ #. * #. * the minutes/seconds format 99" 99' -#. +#. #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "Degrees Minutes Seconds" @@ -3168,25 +3352,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 @@ -3207,29 +3391,30 @@ "error, it should be safe to continue in your work." msgstr "" -"JOSM 預期在資料組合中會找到原型 [{0} {1}] 但卻沒有。請在 http://josm.openstreetmap.de " -"回報這個情況。這不是嚴重的錯誤，繼續您的工作應是安全的。" +"JOSM 預期在資料組合中會找到原型 [{0} {1}] 但卻沒有。請在 http://josm." +"openstreetmap.de 回報這個情況。這不是嚴重的錯誤，繼續您的工作應是安全的。" #: ../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 "缺少 id {0} 路徑的合併目標" -#: ../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 "缺少 id {0} 節點的合併目標" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205 #, java-format msgid "Missing merge target for object with id {0}" msgstr "缺少 id {0} 物件的合併目標" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 -#, java-format -msgid "Missing merge target for node with id {0}" -msgstr "缺少 id {0} 節點的合併目標" - -#: ../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 "缺少 id {0} 關係的合併目標" -#: ../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}" @@ -3237,6 +3422,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 "" @@ -3299,24 +3484,24 @@ msgstr "F" -#: ../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 "預期 ID >= 0。收到 {0}。" -#: ../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 "ID = 0 的原型不能為不可視。" -#: ../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 "預期 ID > 0。收到 {0}。" -#: ../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 "預期版本 > 0。收到 {0}。" -#: ../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 " @@ -3324,5 +3509,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 "" @@ -3354,6 +3539,6 @@ msgstr "發現同一 uid 的使用者但姓名卻不同" -#: ../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}." @@ -3374,5 +3559,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 @@ -3384,6 +3568,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 "不能比較 ID「{0}」和 ID「{1}」的原型。" @@ -3394,135 +3577,135 @@ msgstr "參數「{0}」不應使用範圍 0..{1}，卻收到 {2}" -#: ../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:640 +#: ../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:668 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 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 "找不到限制 {0} 的樣式" -#: ../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 "路徑「{0}」和「{1}」之間的十字路。" -#: ../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 "路徑「{1}」沒有有用的角色「{0}」。" -#: ../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 "多邊形中有非-路徑「{0}」。" -#: ../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 "多邊形「{0}」沒有外部路徑。" -#: ../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 "內部路徑「{0}」的樣式等同多邊形。" -#: ../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 "外部路徑「{0}」的樣式不符。" -#: ../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}" @@ -3534,5 +3717,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 @@ -3549,5 +3732,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 @@ -3566,5 +3749,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 "背景" @@ -3682,6 +3865,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 "無法讀取書籤
''{0}''
錯誤為：{1}" @@ -3696,5 +3878,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 @@ -3702,32 +3884,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" @@ -3735,5 +3917,5 @@ msgstr[0] "{0} 節點" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187 #, java-format msgid "{0} member" @@ -3839,5 +4021,6 @@ "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " "filename" -msgstr "下載每樣。可以是 x1,y1,x2,y2、含有 lat=y&lon=x&zoom=z 的 URL 或檔案名稱" +msgstr "" +"下載每樣。可以是 x1,y1,x2,y2、含有 lat=y&lon=x&zoom=z 的 URL 或檔案名稱" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 @@ -3845,5 +4028,7 @@ "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " "lat=y&lon=x&zoom=z or a filename" -msgstr "下載每樣當作原始 gps。可以是 x1,y1,x2,y2、含有 lat=y&lon=x&zoom=z 的 URL 或檔案名稱" +msgstr "" +"下載每樣當作原始 gps。可以是 x1,y1,x2,y2、含有 lat=y&lon=x&zoom=z 的 URL 或檔" +"案名稱" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 @@ -3851,5 +4036,6 @@ "Add each to the initial selection. Can be a google-like search string or an " "URL which returns osm-xml" -msgstr "加入每一樣到初始選擇區域。可以是 google 式搜尋字串或以 osm-xml 傳回的 URL" +msgstr "" +"加入每一樣到初始選擇區域。可以是 google 式搜尋字串或以 osm-xml 傳回的 URL" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 @@ -3977,12 +4163,12 @@ msgstr "偏好設定 {0} 已經被移除，因為它已不再使用了。" -#: ../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 @@ -3996,19 +4182,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 @@ -4019,5 +4205,5 @@ msgstr "選單：{0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291 msgid "Audio" msgstr "音效" @@ -4061,29 +4247,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 " @@ -4091,9 +4277,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 "使用者：" @@ -4140,5 +4326,6 @@ "relation." msgstr "" -"請確認是否從 1 個關係中移除 1 個物件。" +"請確認是否從 1 個關係中移除 1 個物件。" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127 @@ -4149,5 +4336,6 @@ "relations." msgstr "" -"請確認是否從 {0} 個關係中移除 1 個物件。" +"請確認是否從 {0} 個關係中移除 1 個物件。" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131 @@ -4157,5 +4345,6 @@ "relations." msgstr "" -"請確認是否從 {1} 個關係中移除 {0} 個物件。" +"請確認是否從 {1} 個關係中移除 {0} 個物件。" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140 @@ -4201,5 +4390,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" @@ -4208,5 +4397,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" @@ -4215,5 +4404,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" @@ -4232,5 +4421,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 @@ -4247,5 +4436,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" @@ -4317,22 +4506,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 "參數目前超出範圍：得到 {0}" -#: ../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 "角色 {0} 中的清單目前沒有參與比較配對" -#: ../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 "參數「index」有未預期的數值。得到 {0}" -#: ../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." @@ -4411,6 +4600,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 "將他們選取的元件複製到合併元件清單的結尾" @@ -4479,6 +4667,6 @@ #, java-format msgid "" -"Click {0} to start merging my and their " -"entries." +"Click {0} to start merging my and their entries." msgstr "點選 {0} 開始合併我和他們的項目" @@ -4486,6 +4674,6 @@ #, java-format msgid "" -"Click {0} to finish merging my and their " -"entries." +"Click {0} to finish merging my and their entries." msgstr "點選 {0} 結束合併我和他們的項目" @@ -4539,6 +4727,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 "與伺服器溝通時發生錯誤
詳細資料：{0}" @@ -4563,5 +4751,6 @@ "the server.

Do you want to undelete these nodes too?" msgstr "" -"還有 {0} 個額外的節點也是用於這條在伺服器上
已刪除的路徑 {1}。

是否要一併取消這些節點的刪除？" +"還有 {0} 個額外的節點也是用於這條在伺服器上
已刪除的路徑 {1}。" +"

是否要一併取消這些節點的刪除？" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 @@ -4572,9 +4761,10 @@ #, java-format msgid "" -"There are {0} additional primitives referred to by relation " -"{1}
which are deleted on the server.

Do you want to undelete them " -"too?" -msgstr "" -"這裡有 {0} 個額外的原型參照到已在
伺服器上刪除的關係 {1}。

是否要將它們取消刪除？" +"There are {0} additional primitives referred to by relation {1}" +"
which are deleted on the server.

Do you want to undelete them too?" +"" +msgstr "" +"這裡有 {0} 個額外的原型參照到已在
伺服器上刪除的關係 {1}。

是" +"否要將它們取消刪除？" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 @@ -4686,6 +4876,6 @@ "yo agree?" msgstr "" -"要保留您本地端的版本，JOSM
必須將原型 {0} 的 id 重設為 0。
在下次上傳時伺服器會重新
指派新的 id " -"給它。
您是否同意？" +"要保留您本地端的版本，JOSM
必須將原型 {0} 的 id 重設為 0。
在下次" +"上傳時伺服器會重新
指派新的 id 給它。
您是否同意？" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 @@ -4706,5 +4896,6 @@ "JOSM will have to remove your local primitive with id {0}
from the " "dataset.
Do you agree?" -msgstr "JOSM 即將移除您本地資料組合中 id {0}
的原型。
您是否同意？" +msgstr "" +"JOSM 即將移除您本地資料組合中 id {0}
的原型。
您是否同意？" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 @@ -4721,5 +4912,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 "合併的節點尚未凍結。不能建置決議指令" @@ -4854,5 +5045,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 "接受" @@ -4951,7 +5142,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" @@ -4960,6 +5151,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" @@ -4992,7 +5183,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 "角色：" @@ -5028,5 +5217,6 @@ msgid "" "Enter a tag value, i.e. check members" -msgstr "輸入標籤數值，例如 check members" +msgstr "" +"輸入標籤數值，例如 check members" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123 @@ -5081,5 +5271,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 @@ -5144,10 +5334,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 "" @@ -5222,18 +5411,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 @@ -5243,13 +5432,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 "顯示選取物件的歷史紀錄。" @@ -5439,5 +5628,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 "建立這個關係的複本並且在另一個編輯器視窗開啟它" @@ -5480,30 +5669,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 "Sel.: Rel.:{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 "點選以最小化/最大化面板內容" @@ -5562,37 +5751,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 "" @@ -5601,63 +5790,90 @@ 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] "下載關係中所有不完整的路徑和節點" + +#: ../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 +#, fuzzy, java-format +msgid "({0}/{1}: Downloading relation ''{2}''..." +msgstr "在關係「{2}」設定 {0}={1}" + +#: ../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 "" @@ -5667,15 +5883,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 " @@ -5683,5 +5899,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 " @@ -5689,20 +5905,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 "" @@ -5711,66 +5927,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 " @@ -5779,53 +5999,60 @@ 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" -msgstr "下載關係中所有不完整的路徑和節點" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 +#: ../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: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 +#, fuzzy +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 "" @@ -5835,41 +6062,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 "" @@ -5909,19 +6129,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}''" @@ -5933,6 +6153,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 "" @@ -6110,7 +6329,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 "" @@ -6883,5 +7101,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 @@ -7118,6 +7336,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 "" @@ -7127,6 +7345,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 "" @@ -7389,13 +7607,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}" @@ -7496,6 +7714,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 "" @@ -7580,6 +7797,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] "" @@ -7593,6 +7810,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 " @@ -7647,5 +7864,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 " @@ -7653,5 +7870,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 "" @@ -7724,40 +7941,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:" @@ -7766,5 +7983,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:" @@ -7773,5 +7990,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:" @@ -7780,68 +7997,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 +#: ../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}" @@ -7849,16 +8065,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}." @@ -7866,6 +8082,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 "" @@ -7874,5 +8090,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 "" @@ -7902,110 +8118,55 @@ 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 "不能讀取點 {1} x {2} 的時刻「{0}」" - -#: ../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 "有 Geotag 的圖片" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 -#, java-format -msgid "GPS start: {0}" -msgstr "GPS 開始：{0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 -#, java-format -msgid "GPS end: {0}" -msgstr "GPS 結束：{0}" - -#: ../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] "圖片" - -#: ../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 "JPEG 圖片 (*.jpg)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 -#, java-format -msgid "The date in file \"{0}\" could not be parsed." -msgstr "檔案「{0}」的日期無法解析。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 -#, java-format -msgid "There is no EXIF time within the file \"{0}\"." -msgstr "在檔案「{0}」中沒有 EXIF 時刻。" - -#: ../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 "輸入要顯示的日期 (mm/dd/yyyy HH:MM:SS)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "GPS unit timezone (difference to photo)" -msgstr "GPS 單元時區 (不同於照片)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 -msgid "Synchronize Time with GPS Unit" -msgstr "與 GPS 單元同步時刻" - -#: ../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 +#, fuzzy, java-format +msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''" +msgstr "警告：將偏好設定固定為「{0}」失敗" + +#: ../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 +#, fuzzy +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} 公尺" + +#: ../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 @@ -8013,30 +8174,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 @@ -8044,5 +8205,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 @@ -8051,5 +8212,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 @@ -8058,58 +8219,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 "{0} 的已命名軌跡點" -#: ../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 "Wave 音效檔案 (*.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 "JPEG 圖片 (*.jpg)" + +#: ../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 @@ -8117,5 +8283,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" @@ -8125,5 +8291,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 @@ -8131,22 +8297,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 "URL" - -#: ../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, " @@ -8154,5 +8315,5 @@ msgstr[0] "{0} 路線， " -#: ../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" @@ -8160,22 +8321,24 @@ msgstr[0] "{0} 航點" -#: ../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 "上傳未經處理的 GPS 資料做為地圖資料被認為是有壞處的。
如果您想要上傳軌跡，請看這裡：" - -#: ../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 "" +"上傳未經處理的 GPS 資料做為地圖資料被認為是有壞處的。
如果您想要上傳" +"軌跡，請看這裡：" + +#: ../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 @@ -8185,40 +8348,41 @@ 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 "從 OSM 沿這條軌跡下載" -#: ../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 "" "This action will require {0} individual
download requests. Do you " "wish
to continue?" -msgstr "這個動作會發出 {0} 個
個別的下載要求。您是否希望
繼續？" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073 +msgstr "" +"這個動作會發出 {0} 個
個別的下載要求。您是否希望
繼續？" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074 msgid "No GPX track available in layer to associate audio with." msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。" -#: ../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 " @@ -8226,5 +8390,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 " @@ -8232,23 +8396,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 "版本 {0}" -#: ../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 "警告：混合 0.6 和 0.5 資料會成為 0.5 版" -#: ../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." @@ -8257,5 +8421,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 "" @@ -8269,5 +8433,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 "" @@ -8280,11 +8444,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" @@ -8293,32 +8457,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 "API 版本： {0}" -#: ../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 "轉換為 GPX 圖層" -#: ../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 "" @@ -8326,6 +8490,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 "" @@ -8360,4 +8524,354 @@ msgstr[0] "{0} 點" +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131 +msgid "GPX Files (*.gpx *.gpx.gz)" +msgstr "GPX 檔案 (*.gpx *.gpx.gz)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152 +#, java-format +msgid "File {0} is loaded yet under the name \"{1}\"" +msgstr "檔案 {0} 已經以「{1}」的名稱載入了。" + +#: ../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 "" +"配合您的 GPS 接收器拍照，它會顯示時刻。
在這裡顯示照片。
然後，根" +"據您讀取到的相片時刻並選擇時區
" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242 +msgid "Photo time (from exif):" +msgstr "相片時刻 (取自 exif):" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +msgid "Gps time (read from the above photo): " +msgstr "Gps 時刻（自上列相片讀取）： " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269 +msgid " [dd/mm/yyyy hh:mm:ss]" +msgstr " [dd/mm/yyyy hh:mm:ss]" + +#: ../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 "從 GPS 接收器的相片同步時間" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 +msgid "" +"Error while parsing the date.\n" +"Please use the requested format" +msgstr "" +"分析日期時發生錯誤。\n" +"請使用要求的格式" + +#: ../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 "<尚未載入 GPX 軌跡>" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455 +msgid "GPX track: " +msgstr "GPX 軌跡： " + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460 +msgid "Open another GPX trace" +msgstr "開啟另一個 GPX 軌跡" + +#: ../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 "我的 GPS 接收器可以拍照。
這樣有幫助嗎？" + +#: ../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 "圖片沒有 exif 位置" + +#: ../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 "將圖片與 GPX 軌跡關聯" + +#: ../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 "您應該選擇一個 GPX 軌跡" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593 +msgid "No selected GPX track" +msgstr "沒有選取的 GPX 軌跡" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605 +#, java-format +msgid "" +"Error while parsing timezone.\n" +"Expected format: {0}" +msgstr "" +"分析時區時發生錯誤。\n" +"預期的格式：{0}" + +#: ../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 "" +"在分析補償時發生錯誤。\n" +"預期的格式：{0}" + +#: ../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 "在 GPX 軌跡 {2} 中找到 {1} 的 {0} 個符合項" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660 +msgid "GPX Track loaded" +msgstr "GPX 軌跡已載入" + +#: ../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 "選取的 GPX 軌跡沒有包含時間戳記。請選擇另一個。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731 +msgid "GPX Track has no time information" +msgstr "GPX 軌跡沒有時刻資訊" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776 +#, java-format +msgid "Timezone: {0}" +msgstr "時區：{0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777 +#, java-format +msgid "Minutes: {0}" +msgstr "分鐘：{0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778 +#, java-format +msgid "Seconds: {0}" +msgstr "秒鐘：{0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795 +#, java-format +msgid "Matched {0} of {1} photos to GPX track." +msgstr "已比對 {1} 張相片中的 {0} 張到 GPX 軌跡。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798 +#, java-format +msgid "(Time difference of {0} days)" +msgstr "({0} 天的時間差異)" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805 +#, java-format +msgid "Offset between track and photos: {0}m {1}s" +msgstr "在軌跡與相片間的補償：{0}分 {1}秒" + +#: ../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 "在試著比對相片與 GPX 軌跡時發生錯誤。您可以使用滑動鈕來手動比對相片。" + +#: ../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 "從 EXIF 中解出 GPS 位置" + +#: ../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 "無法取得目錄 {0} 的路徑\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210 +#, java-format +msgid "Scanning directory {0}" +msgstr "正在掃描目錄 {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215 +#, java-format +msgid "Found null file in directory {0}\n" +msgstr "在目錄 {0} 找到空的檔案\n" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218 +#, java-format +msgid "Error while getting files from directory {0}\n" +msgstr "從目錄 {0} 取得檔案時發生錯誤\n" + +#: ../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 "有 Geotag 的圖片" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352 +msgid "Correlate to GPX" +msgstr "關聯到 GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370 +msgid "image" +msgid_plural "images" +msgstr[0] "圖片" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371 +#, java-format +msgid "{0} were found to be gps tagged." +msgstr "已發現 {0} 具有 GPS 標籤。" + +#: ../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 "正在載入 {0}" + +#: ../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 "檔案 {0} 有錯誤" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53 +#, fuzzy +msgid "Display geotagged images" +msgstr "顯示有 Geotag 的相片" + +#: ../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 "最適與 1:1 縮放" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186 +#, java-format +msgid "" +"\n" +"Altitude: {0} m" +msgstr "" +"\n" +"高度： {0} m" + +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189 +#, java-format +msgid "" +"\n" +"{0} km/h" +msgstr "" +"\n" +"{0} 公里/小時" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152 msgid "gps marker" @@ -8653,5 +9167,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 @@ -8843,6 +9357,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 "使用表格查詢的方式繪製方向箭頭而非複雜的數學運算。" @@ -8876,5 +9389,6 @@ "Colors points and track segments by dilution of position (HDOP). Your " "capture device needs to logs that information." -msgstr "依位置準確誤差 (HDOP) 來為點和軌跡區段上色。您的記錄裝置必須能記錄該項資訊。" +msgstr "" +"依位置準確誤差 (HDOP) 來為點和軌跡區段上色。您的記錄裝置必須能記錄該項資訊。" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188 @@ -8901,6 +9415,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 "在地圖檢視套用平滑化以產生較平滑的外觀。" @@ -8968,19 +9481,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 @@ -9239,6 +9752,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 "" @@ -9294,5 +9807,7 @@ "

Please note that shortcuts keys are assigned to the actions when JOSM is " "started. So you need to restart JOSM to see your changes.

" -msgstr "

請注意捷徑鍵是在 JOSM 啓動時才分配給各動作。因此您需要 重新啟動 JOSM 才能看到您的變更。

" +msgstr "" +"

請注意捷徑鍵是在 JOSM 啓動時才分配給各動作。因此您需要 重新啟動 " +"JOSM 才能看到您的變更。

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:167 @@ -9301,6 +9816,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 "" @@ -9313,15 +9828,16 @@ "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...

" -msgstr "" -"

您可能會注意到下一頁的按鍵選擇清單列出了所有 Java " -"認識的按鍵，而不只是在您鍵盤上的按鍵。請只使用確實能對應到您鍵盤上實際按鍵的數值。因此如果您的鍵盤沒有「Copy」按鍵 （PC 鍵盤沒有它們，Sun " -"鍵盤才有），就不要使用它。同時有些列出來的「按鍵」對應到您鍵盤上的特殊鍵（如 ':'/冒號）。也請不要使用它們，而要使用其基底按鍵（US 鍵盤是 " -"';'/分號，德國鍵盤是 '.'/句點，...）來代替。不照這個規則做可能會造成衝突，因為 JOSM 無法了解 Ctrl+Shift+; 和 " -"Ctrl+: 在 US 鍵盤上是相同的情形...

" +"(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 "" +"

您可能會注意到下一頁的按鍵選擇清單列出了所有 Java 認識的按鍵，而不只是在您" +"鍵盤上的按鍵。請只使用確實能對應到您鍵盤上實際按鍵的數值。因此如果您的鍵盤沒" +"有「Copy」按鍵 （PC 鍵盤沒有它們，Sun 鍵盤才有），就不要使用它。同時有些列出" +"來的「按鍵」對應到您鍵盤上的特殊鍵（如 ':'/冒號）。也請不要使用它們，而要使用" +"其基底按鍵（US 鍵盤是 ';'/分號，德國鍵盤是 '.'/句點，...）來代替。不照這個規" +"則做可能會造成衝突，因為 JOSM 無法了解 Ctrl+Shift+; 和 Ctrl+: 在 US 鍵盤上是" +"相同的情形...

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177 @@ -9344,6 +9860,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 "" @@ -9435,5 +9951,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 "更多關於這個功能的資訊" @@ -9519,5 +10035,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 @@ -9525,5 +10041,5 @@ msgstr "解析伺服器回覆的日期「{0}」。" -#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87 #, java-format msgid "" @@ -9643,14 +10159,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 @@ -9678,24 +10193,30 @@ msgstr "伺服器對 id {0} 傳回回應代碼 404。正在略過它。" -#: ../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}..." #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 @@ -9737,27 +10258,27 @@ msgstr "缺少偏好設定「{0}」。不能初始化 OsmApi" -#: ../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 "這個版本的 JOSM 與設定的伺服器。" -#: ../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}." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164 +#, fuzzy, java-format +msgid "" +"It supports protocol version 0.6, while the server says it supports {0} to " +"{1}." msgstr "它支援 0.5 和 0.6 版的協定，但是該伺服器說它支援 {0} 到 {1}。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "使用 {1} 版協定建立與 {0} 的連線" -#: ../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 "伺服器回覆未預期的 id 格式，取得「{0}」" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263 #, java-format msgid "" @@ -9765,66 +10286,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}." @@ -9859,5 +10380,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}''." @@ -9884,5 +10405,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}." @@ -9890,5 +10411,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}" @@ -9901,5 +10422,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}''." @@ -9957,10 +10478,10 @@ #: ../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." -msgstr "" -"警告：此密碼是以純文字的方式儲存於偏好設定檔案中。
密碼也是在 URL " -"中以純文字的方式傳送到伺服器。
請勿使用重要的密碼。" +"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 "" +"警告：此密碼是以純文字的方式儲存於偏好設定檔案中。
密碼也是在 URL 中" +"以純文字的方式傳送到伺服器。
請勿使用重要的密碼。" #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 @@ -9987,6 +10508,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 "" @@ -10052,46 +10573,45 @@ msgstr "檔案「{0}」不存在" -#: ../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 "" @@ -10099,19 +10619,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 "不完整的 > 規格，ref=0" -#: ../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 "" @@ -10121,8 +10641,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 "" @@ -10132,25 +10652,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 "" @@ -10158,5 +10678,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447 #, java-format msgid "" @@ -10165,5 +10685,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496 #, java-format msgid "" @@ -10171,5 +10691,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507 #, java-format msgid "" @@ -10178,13 +10698,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 "準備 OSM 資料..." -#: ../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 "" @@ -10237,4 +10757,10 @@ msgid "Contacting Server..." msgstr "正在連接伺服器..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62 +#, fuzzy, java-format +msgid "Expected value > 0 for parameter ''{0}'', got {1}" +msgstr "參數「index」有未預期的數值。得到 {0}" #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63 @@ -10272,43 +10798,44 @@ 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 +#, fuzzy, java-format +msgid "Value >0 expected for parameter ''{0}'', got {1}" +msgstr "參數「index」有未預期的數值。得到 {0}" + +#: ../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 +#, fuzzy, java-format +msgid "({0}/{1}) Uploading {2} objects..." +msgstr "正在上傳 {0} 個物件..." + +#: ../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 "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44 @@ -10349,17 +10876,27 @@ msgstr "正在下載外掛程式 {0}..." -#: ../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}." @@ -10371,19 +10908,18 @@ msgstr "外掛程式 {0} 發生錯誤" -#: ../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" @@ -10392,50 +10928,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 "上次的外掛程式更新已是 {0} 天前。" -#: ../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 "外掛程式 {0} 要求 JOSM 更新到 {1} 版。" -#: ../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 "外掛程式 {1} 要求 外掛程式 {0} 但是找不到。" -#: ../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 "找不到外掛程式：{0}。" -#: ../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 "無法載入外掛程式 {0}。是否從偏好設定中刪除？" -#: ../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 " @@ -10443,9 +10979,9 @@ msgstr "啓用更新的外掛程式失敗。請檢查 JOSM 是否有覆蓋既存項目的權限。" -#: ../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 "" @@ -10453,19 +10989,19 @@ msgstr "發生未預期的例外，可能來自「{0}」外掛程式。" -#: ../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 "根據此外掛程式的資訊，作者是 {0}。" -#: ../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 " @@ -10473,13 +11009,13 @@ msgstr "該外掛程式已從組態中移除。請重新啟動 JOSM 以卸載外掛程式。" -#: ../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" @@ -10597,6 +11133,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 "" @@ -10634,6 +11170,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 "" @@ -10695,7 +11231,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 "" @@ -10707,7 +11242,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 "" @@ -10739,6 +11274,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 "" @@ -10996,5 +11531,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" @@ -11009,12 +11544,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 @@ -11022,452 +11555,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 +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 "AgPifoJ - 有 Geotag 的相片" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "Display geotagged photos" -msgstr "顯示有 Geotag 的相片" - -#: ../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 "最適與 1:1 縮放" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 -#, java-format -msgid "" -"\n" -"Altitude: {0} m" -msgstr "" -"\n" -"高度： {0} m" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#, java-format -msgid "" -"\n" -"{0} km/h" -msgstr "" -"\n" -"{0} 公里/小時" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114 -msgid "Extracting GPS locations from EXIF" -msgstr "從 EXIF 中解出 GPS 位置" - -#: ../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 "無法取得目錄 {0} 的路徑\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#, java-format -msgid "Scanning directory {0}" -msgstr "正在掃描目錄 {0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204 -#, java-format -msgid "Found null file in directory {0}\n" -msgstr "在目錄 {0} 找到空的檔案\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207 -#, java-format -msgid "Error while getting files from directory {0}\n" -msgstr "從目錄 {0} 取得檔案時發生錯誤\n" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296 -msgid "Correlate to GPX" -msgstr "關聯到 GPX" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "已發現 {0} 具有 GPS 標籤。" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "以 AgPifoJ 開啟圖片..." - -#: ../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 "GPX 檔案 (*.gpx *.gpx.gz)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#, java-format -msgid "File {0} is loaded yet under the name \"{1}\"" -msgstr "檔案 {0} 已經以「{1}」的名稱載入了。" - -#: ../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 "" -"配合您的 GPS 接收器拍照，它會顯示時刻。
在這裡顯示照片。
然後，根據您讀取到的相片時刻並選擇時區
" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -msgid "Photo time (from exif):" -msgstr "相片時刻 (取自 exif):" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -msgid "Gps time (read from the above photo): " -msgstr "Gps 時刻（自上列相片讀取）： " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -msgid " [dd/mm/yyyy hh:mm:ss]" -msgstr " [dd/mm/yyyy hh:mm:ss]" - -#: ../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 "從 GPS 接收器的相片同步時間" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -msgid "" -"Error while parsing the date.\n" -"Please use the requested format" -msgstr "" -"分析日期時發生錯誤。\n" -"請使用要求的格式" - -#: ../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 "<尚未載入 GPX 軌跡>" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 -msgid "GPX track: " -msgstr "GPX 軌跡： " - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -msgid "Open another GPX trace" -msgstr "開啟另一個 GPX 軌跡" - -#: ../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 "我的 GPS 接收器可以拍照。
這樣有幫助嗎？" - -#: ../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 "圖片沒有 exif 位置" - -#: ../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 "將圖片與 GPX 軌跡關聯" - -#: ../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 "您應該選擇一個 GPX 軌跡" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593 -msgid "No selected GPX track" -msgstr "沒有選取的 GPX 軌跡" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 -#, java-format -msgid "" -"Error while parsing timezone.\n" -"Expected format: {0}" -msgstr "" -"分析時區時發生錯誤。\n" -"預期的格式：{0}" - -#: ../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 "" -"在分析補償時發生錯誤。\n" -"預期的格式：{0}" - -#: ../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 "在 GPX 軌跡 {2} 中找到 {1} 的 {0} 個符合項" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660 -msgid "GPX Track loaded" -msgstr "GPX 軌跡已載入" - -#: ../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 "選取的 GPX 軌跡沒有包含時間戳記。請選擇另一個。" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -msgid "GPX Track has no time information" -msgstr "GPX 軌跡沒有時刻資訊" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#, java-format -msgid "Timezone: {0}" -msgstr "時區：{0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#, java-format -msgid "Minutes: {0}" -msgstr "分鐘：{0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#, java-format -msgid "Seconds: {0}" -msgstr "秒鐘：{0}" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "已比對 {1} 張相片中的 {0} 張到 GPX 軌跡。" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#, java-format -msgid "(Time difference of {0} days)" -msgstr "({0} 天的時間差異)" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "在軌跡與相片間的補償：{0}分 {1}秒" - -#: ../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 "在試著比對相片與 GPX 軌跡時發生錯誤。您可以使用滑動鈕來手動比對相片。" - -#: ../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 "正在載入 {0}" - -#: ../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 "檔案 {0} 有錯誤" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 @@ -11614,11 +11838,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 "" @@ -11905,5 +12128,7 @@ "Enter the town,village or city name.
Use the syntax and punctuation " "known by www.cadastre.gouv.fr ." -msgstr "輸入鎮、鄉或城市名稱。
使用在 www.cadastre.gouv.fr 已知的語法及標點。" +msgstr "" +"輸入鎮、鄉或城市名稱。
使用在 www.cadastre.gouv.fr 已知的語法及標" +"點。" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:61 @@ -11926,11 +12151,4 @@ msgid "Export as PNG format (only raster images)" 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] "簡化路徑（移除 {0} 個節點）" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 @@ -12047,14 +12265,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:41 +#: ../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:39 +#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 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 " @@ -12265,6 +12483,6 @@ "plugin/" msgstr "" -"不能載入 rxtxSerial 程式庫。如果您需要安裝上的支援，試試在 http://www.raphael-mack.de/josm-" -"globalsat-gpx-import-plugin/ 的 Globalsat 首頁" +"不能載入 rxtxSerial 程式庫。如果您需要安裝上的支援，試試在 http://www." +"raphael-mack.de/josm-globalsat-gpx-import-plugin/ 的 Globalsat 首頁" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 @@ -12366,4 +12584,8 @@ msgstr "以 ImageWayPoing 開啟圖片" +#: ../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" @@ -12407,18 +12629,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 "執行近似 Douglas-Peucker..." -#: ../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" @@ -12467,7 +12689,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -12477,5 +12699,5 @@ #. 50000 #. -#. +#. #. #. @@ -12485,5 +12707,5 @@ #. 50000 #. -#. +#. #. #. @@ -12492,5 +12714,5 @@ #. 50000 #. -#. +#. #. #. @@ -12500,5 +12722,5 @@ #. 50000 #. -#. +#. #. #. @@ -12576,6 +12798,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 "在每個產生的路徑中允許的最大區段數。預設為 250。" @@ -12590,13 +12811,15 @@ "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be " "in the range 0-255. Default 90." -msgstr "被認定為水域的最大灰色數值（基於 Landsat IR-1 資料。可以是範圍 0-255。預設值為 90。" +msgstr "" +"被認定為水域的最大灰色數值（基於 Landsat IR-1 資料。可以是範圍 0-255。預設值" +"為 90。" #: ../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." -msgstr "" -"Douglas-Peucker 線條簡化的準確度，以度為測量單位。
較低的數值會產生較多的節點，和更準確的線條。預設值為 0.0003。" +"Accuracy of Douglas-Peucker line simplification, measured in degrees." +"
Lower values give more nodes, and more accurate lines. Default 0.0003." +msgstr "" +"Douglas-Peucker 線條簡化的準確度，以度為測量單位。
較低的數值會產生較多的" +"節點，和更準確的線條。預設值為 0.0003。" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 @@ -12657,20 +12880,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 "連線失敗" @@ -12864,6 +13086,6 @@ "new server? (Strongly recommended)" msgstr "" -"openstreetbugs 外掛程式用的是在 appspot.com 的舊伺服器。
新的伺服器在 " -"schokokeks.org。
是否要切換至新的伺服器？（強烈建議）" +"openstreetbugs 外掛程式用的是在 appspot.com 的舊伺服器。
新的伺服器" +"在 schokokeks.org。
是否要切換至新的伺服器？（強烈建議）" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94 @@ -12875,5 +13097,7 @@ "The selected data contains data from OpenStreetBugs.
You cannot " "upload this data. Maybe you have selected the wrong layer?" -msgstr "選取的資料包含來自 OpenStreetBugs 的資料。
您不能上傳這資料。您可能選擇了錯誤的圖層？" +msgstr "" +"選取的資料包含來自 OpenStreetBugs 的資料。
您不能上傳這資料。您可能" +"選擇了錯誤的圖層？" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64 @@ -12889,6 +13113,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 "標頭包含許多數值而且不能對映為單一字串" @@ -12929,5 +13152,7 @@ "Really mark this issue as ''done''?

You may add an optional " "comment:" -msgstr "確定將這個議題標記為「已解決」？

您也許可以加入額外的註解：" +msgstr "" +"確定將這個議題標記為「已解決」？

您也許可以加入額外的註解：" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64 @@ -12969,9 +13194,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 "Osmarender" -#: ../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 " @@ -12979,9 +13205,5 @@ msgstr "找不到 Firefox。請在偏好設定的地圖設定頁面設定 firefox 執行檔。" -#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126 -msgid "osmarender options" -msgstr "osmarender 選項" - -#: ../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 "Firefox 可執行檔" @@ -13028,5 +13250,7 @@ "port is not variable because it is referenced by external applications " "talking to the plugin." -msgstr "遠端控制外掛程式會一直聽取本機的 8111 連接埠。此連接埠是無法改變的，因為它參照了外部應用程式與此外掛程式的溝通。" +msgstr "" +"遠端控制外掛程式會一直聽取本機的 8111 連接埠。此連接埠是無法改變的，因為它參" +"照了外部應用程式與此外掛程式的溝通。" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41 @@ -13353,17 +13577,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 "反轉連棟建築" @@ -13407,162 +13631,4 @@ msgid "Optional" 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 "「{0}」尚未封閉因此不能連結。" - -#: ../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 "" -"選取的路徑有在已下載資料區域之外的節點。\n" -"這樣可能會造成意外刪除某些節點。\n" -"確定要繼續嗎？" - -#: ../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 "您也可以貼上 www.openstreetmap.org 的 URL" - -#: ../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] "選擇區域包含 {0} 條路徑。確定要全部簡化？" - -#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91 -msgid "Are you sure?" -msgstr "您確定嗎？" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -13660,5 +13726,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}" @@ -13711,34 +13777,34 @@ msgstr "下次忽略選取的錯誤。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 +#: ../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:197 +#: ../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:197 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196 msgid "Nothing" msgstr "不做任何事" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Ignore whole group or individual elements?" msgstr "忽略整個群組或是個別元件？" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198 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 "" @@ -13787,18 +13853,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 "" @@ -14029,10 +14095,9 @@ #: ../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." -msgstr "" -"拼字檢查或標籤檢查資料檔案的來源（URL 或檔案名稱）（請查閱 " -"http://wiki.openstreetmap.org/index.php/User:JLS/speller）" +"The sources (URL or filename) of spell check (see http://wiki.openstreetmap." +"org/index.php/User:JLS/speller) or tag checking data files." +msgstr "" +"拼字檢查或標籤檢查資料檔案的來源（URL 或檔案名稱）（請查閱 http://wiki." +"openstreetmap.org/index.php/User:JLS/speller）" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 @@ -14174,5 +14239,5 @@ #. 50000 #. -#. +#. #. #. @@ -14180,5 +14245,5 @@ #. #. -#. +#. #. #. @@ -14188,5 +14253,5 @@ #. 50000 #. -#. +#. #. #. @@ -14195,5 +14260,5 @@ #. 50000 #. -#. +#. #. #. @@ -14202,5 +14267,5 @@ #. 50000 #. -#. +#. #. #. @@ -14209,5 +14274,5 @@ #. 50000 #. -#. +#. #. #. @@ -14216,5 +14281,5 @@ #. 50000 #. -#. +#. #. #. @@ -14223,9 +14288,9 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -14270,5 +14335,5 @@ #. 50000 #. -#. +#. #. #. @@ -14401,14 +14466,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 +14482,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 +14498,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 +14508,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." @@ -14605,50 +14670,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 "將 WMS 圖層儲存為檔案" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373 msgid "Save WMS layer" msgstr "儲存 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397 msgid "Load WMS layer from file" msgstr "從檔案載入 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "Load WMS layer" msgstr "載入 WMS 圖層" -#: ../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 "不支援的 WMS 檔案版本；發現 {0}，應為 {1}" -#: ../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 "" @@ -14724,5 +14789,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 "" @@ -14741,5 +14806,7 @@ "The maximum bbox size is 0.25, and your request was too large. Either " "request a smaller area, or use planet.osm" -msgstr "最大的 bbox 大小為 0.25，而您的要求太大了。請使用更小的區域，或改用 planet.osm" +msgstr "" +"最大的 bbox 大小為 0.25，而您的要求太大了。請使用更小的區域，或改用 planet." +"osm" #. OSM server message @@ -14760,21 +14827,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 "JOSM 的另一個 geotag 外掛程式。將相片與 GPS 軌跡關聯或匯入 EXIF 已有 geotag 的相片。" - -#. Plugin cadastre-fr -#: build/trans_plugins.java:7 msgid "A special handler for the French land registry WMS server." msgstr "用於法國土地登記 WMS 伺服器的特別處理程式。" #. Plugin colorscheme -#: build/trans_plugins.java:9 +#: build/trans_plugins.java:7 msgid "" "Allows the user to create different color schemes and to switch between " @@ -14784,14 +14846,15 @@ "true :-)" msgstr "" -"允許使用者建立不同的顏色配置並在它們之間切換。只要改變顏色並建立新的配置即可。可用來切換為白色背景以便在明亮的陽光下有較佳的視覺感受。請查閱 JOSM " -"偏好設定中的對話盒與「地圖設定值」 (有點怪但確是真的 :-)" +"允許使用者建立不同的顏色配置並在它們之間切換。只要改變顏色並建立新的配置即" +"可。可用來切換為白色背景以便在明亮的陽光下有較佳的視覺感受。請查閱 JOSM 偏好" +"設定中的對話盒與「地圖設定值」 (有點怪但確是真的 :-)" #. Plugin Create_grid_of_ways -#: build/trans_plugins.java:11 +#: build/trans_plugins.java:9 msgid "Create a grid of ways." msgstr "建立路徑的格線。" #. Plugin czechaddress -#: build/trans_plugins.java:13 +#: build/trans_plugins.java:11 msgid "" "Creating and handling address nodes and buildings within Czech Republic." @@ -14799,22 +14862,24 @@ #. Plugin dataimport -#: build/trans_plugins.java:15 +#: build/trans_plugins.java:13 msgid "Allows to import various file formats into JOSM directly." msgstr "允許直接將多種檔案格式匯入 JOSM。" #. Plugin DirectUpload -#: build/trans_plugins.java:17 +#: build/trans_plugins.java:15 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " "openstreetmap.org." -msgstr "這個外掛程式可以將 JOSM 中目前使用的圖層 GPS 軌跡直接上傳至 openstreetmap.org。" +msgstr "" +"這個外掛程式可以將 JOSM 中目前使用的圖層 GPS 軌跡直接上傳至 openstreetmap." +"org。" #. Plugin Duplicate-Way -#: build/trans_plugins.java:19 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "重製路徑並位移" #. Plugin editgpx -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -14823,21 +14888,20 @@ #. Plugin globalsat +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." +msgstr "在 JOSM 中直接從 Globalsat dg100 資料記錄器下載 GPS 點。" + +#. Plugin graphview #: build/trans_plugins.java:23 -msgid "" -"Download GPS points from Globalsat dg100 data logger directly in JOSM." -msgstr "在 JOSM 中直接從 Globalsat dg100 資料記錄器下載 GPS 點。" - -#. 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 -#: build/trans_plugins.java:27 msgid "Provide a background layer that displays a map grid" msgstr "提供顯示地圖格線的背景圖層" #. Plugin ImageWayPoint -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -14845,14 +14909,14 @@ "the filename of an image." msgstr "" -"另一個用來將圖片與 GPX " -"檔案中的航點配對的外掛程式。配對的方式是當航點標籤的「name」、「cmt」或「desc」屬性與圖片的檔案名稱相符時就是配對成功。" +"另一個用來將圖片與 GPX 檔案中的航點配對的外掛程式。配對的方式是當航點標籤的" +"「name」、「cmt」或「desc」屬性與圖片的檔案名稱相符時就是配對成功。" #. Plugin lakewalker -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "協助將 WMS 圖片向量化。" #. Plugin livegps -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -14860,18 +14924,20 @@ #. Plugin measurement -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " "segments, area surrounded by a (simple) closed way and create measurement " "paths (which also can be imported from a gps layer)." -msgstr "提供測量對話盒與圖層以測量區段、由（簡單的）封閉路徑圍繞的區域的長度與角度，並建立測量路徑（也可以從 gps 圖層匯入）。" +msgstr "" +"提供測量對話盒與圖層以測量區段、由（簡單的）封閉路徑圍繞的區域的長度與角度，" +"並建立測量路徑（也可以從 gps 圖層匯入）。" #. 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 " @@ -14880,5 +14946,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 " @@ -14886,18 +14952,19 @@ "mouse moving (general Java - tablet problem)." msgstr "" -"當您進行小且短暫的拖曳時模擬為點選動作。這對平板電腦的觸控筆很有用，當您有問題時只要點選面板而不需移動滑鼠（一般性 Java - 平板電腦問題）。" +"當您進行小且短暫的拖曳時模擬為點選動作。這對平板電腦的觸控筆很有用，當您有問" +"題時只要點選面板而不需移動滑鼠（一般性 Java - 平板電腦問題）。" #. Plugin openlayers -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:41 msgid "Displays an OpenLayers background image" msgstr "顯示 OpenLayers 背景圖片" #. Plugin openstreetbugs -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:43 msgid "Imports issues from OpenStreetBugs" msgstr "匯入OpenStreetBugs 的議題" #. Plugin openvisible -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:45 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -14905,5 +14972,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:47 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -14911,5 +14978,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:49 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -14918,15 +14985,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:51 msgid "The great JGoodies Plastic Look and Feel." msgstr "超棒的 JGoodies 塑膠外觀與感覺。" #. Plugin remotecontrol -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:53 msgid "Let other applications send commands to JOSM." msgstr "讓其他的應用程式傳送指令給 JOSM。" #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:55 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -14935,54 +15002,52 @@ #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:57 msgid "Provides routing capabilities." msgstr "提供路線規畫的功能。" #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:59 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " "background and request updates." -msgstr "在 JOSM 中顯示快速地圖格線。可以從快速地圖中載入拼貼作為背景並要求更新。" +msgstr "" +"在 JOSM 中顯示快速地圖格線。可以從快速地圖中載入拼貼作為背景並要求更新。" #. Plugin surveyor -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:61 msgid "Allow adding markers/nodes on current gps positions." msgstr "允許在目前的 gps 位置加入標記/節點。" #. Plugin tageditor -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:63 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "提供在表格線中編輯標籤的對話盒。" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:65 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " "tagging presets (quick preview of the dialog that will popup). You can start " "the jar-file as standalone as well." -msgstr "在求助選單中加入標籤預設組合測試器，可以協助您進行標籤預設組合的開發（會彈出快速預覽對話盒）。您也可以單獨以 jar-檔案的方式啟動。" +msgstr "" +"在求助選單中加入標籤預設組合測試器，可以協助您進行標籤預設組合的開發（會彈出" +"快速預覽對話盒）。您也可以單獨以 jar-檔案的方式啟動。" #. Plugin terracer -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:67 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 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " "for the common ones. Spellcheck integrated for tag names." -msgstr "OSM 資料驗證器。它會檢查資料中的問題，並提供對一般問題的修正。同時整合了對標籤名稱的拼字檢查。" +msgstr "" +"OSM 資料驗證器。它會檢查資料中的問題，並提供對一般問題的修正。同時整合了對標" +"籤名稱的拼字檢查。" #. Plugin walkingpapers -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:71 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -14991,10 +15056,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, ...)." @@ -16047,8 +16112,8 @@ #. 40000 #. -#. +#. #. #. -#. +#. #. #. @@ -16245,5 +16310,5 @@ #. color motorroad #. -#. +#. #. #. @@ -16253,5 +16318,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16270,5 +16335,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16278,5 +16343,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16295,5 +16360,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16303,5 +16368,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16320,5 +16385,5 @@ #. 200000000 #. -#. +#. #. #. @@ -16328,5 +16393,5 @@ #. 300000 #. -#. +#. #. #. @@ -16341,5 +16406,5 @@ #. 300000 #. -#. +#. #. #. @@ -16357,5 +16422,5 @@ #. 50000 #. -#. +#. #. #. @@ -16373,5 +16438,5 @@ #. 40000 #. -#. +#. #. #. @@ -16380,5 +16445,5 @@ #. 40000 #. -#. +#. #. #. @@ -16388,5 +16453,5 @@ #. 50000 #. -#. +#. #. #. @@ -16406,5 +16471,5 @@ #. 50000 #. -#. +#. #. #. @@ -16413,5 +16478,5 @@ #. 50000 #. -#. +#. #. #. @@ -16421,5 +16486,5 @@ #. 50000 #. -#. +#. #. #. @@ -16469,7 +16534,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -17168,5 +17233,5 @@ #. item "Barriers/Border Control" check "Motorcar" #. -#. +#. #. #: build/trans_presets.java:932 @@ -17205,5 +17270,5 @@ #. #. -#. +#. #. #: build/trans_presets.java:954 @@ -17299,5 +17364,5 @@ #. item "Barriers/Sally Port" check "Motorcar" -#. +#. #. group "Water" #. item "Water/Water/River" combo "Layer" @@ -17454,5 +17519,5 @@ #. 50000 #. -#. +#. #. #. @@ -18839,5 +18904,5 @@ #. 30000 #. -#. +#. #. #. @@ -18847,5 +18912,5 @@ #. 40000 #. -#. +#. #. #. @@ -18855,5 +18920,5 @@ #. 20000 #. -#. +#. #. #. @@ -18863,5 +18928,5 @@ #. 40000 #. -#. +#. #. #. @@ -19219,7 +19284,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -19229,5 +19294,5 @@ #. 50000 #. -#. +#. #. #. @@ -19237,5 +19302,5 @@ #. 50000 #. -#. +#. #. #. @@ -19245,5 +19310,5 @@ #. 50000 #. -#. +#. #. #. @@ -19253,5 +19318,5 @@ #. 50000 #. -#. +#. #. #. @@ -19261,5 +19326,5 @@ #. 50000 #. -#. +#. #. #. @@ -19269,5 +19334,5 @@ #. 50000 #. -#. +#. #. #. @@ -19277,5 +19342,5 @@ #. 50000 #. -#. +#. #. #. @@ -19285,5 +19350,5 @@ #. 50000 #. -#. +#. #. #. @@ -19293,5 +19358,5 @@ #. 50000 #. -#. +#. #. #. @@ -19301,5 +19366,5 @@ #. 50000 #. -#. +#. #. #. @@ -19309,5 +19374,5 @@ #. 50000 #. -#. +#. #. #. @@ -19317,5 +19382,5 @@ #. 50000 #. -#. +#. #. #. @@ -19325,5 +19390,5 @@ #. 50000 #. -#. +#. #. #. @@ -19333,5 +19398,5 @@ #. 50000 #. -#. +#. #. #. @@ -19341,5 +19406,5 @@ #. 50000 #. -#. +#. #. #. @@ -19349,5 +19414,5 @@ #. 50000 #. -#. +#. #. #. @@ -19357,5 +19422,5 @@ #. 50000 #. -#. +#. #. #. @@ -19365,5 +19430,5 @@ #. 50000 #. -#. +#. #. #. @@ -19373,5 +19438,5 @@ #. 50000 #. -#. +#. #. #. @@ -19381,5 +19446,5 @@ #. 50000 #. -#. +#. #. #. @@ -19389,5 +19454,5 @@ #. 50000 #. -#. +#. #. #. @@ -19397,5 +19462,5 @@ #. 50000 #. -#. +#. #. #. @@ -19405,5 +19470,5 @@ #. 50000 #. -#. +#. #. #. @@ -19413,5 +19478,5 @@ #. 50000 #. -#. +#. #. #. @@ -19421,5 +19486,5 @@ #. 50000 #. -#. +#. #. #. @@ -19429,5 +19494,5 @@ #. 50000 #. -#. +#. #. #. @@ -19437,5 +19502,5 @@ #. 50000 #. -#. +#. #. #. @@ -19445,5 +19510,5 @@ #. 50000 #. -#. +#. #. #. @@ -19453,5 +19518,5 @@ #. 50000 #. -#. +#. #. #. @@ -19461,5 +19526,5 @@ #. 50000 #. -#. +#. #. #. @@ -19469,5 +19534,5 @@ #. 50000 #. -#. +#. #. #. @@ -19477,5 +19542,5 @@ #. 50000 #. -#. +#. #. #. @@ -19485,5 +19550,5 @@ #. 50000 #. -#. +#. #. #. @@ -19493,5 +19558,5 @@ #. 50000 #. -#. +#. #. #. @@ -19501,5 +19566,5 @@ #. 50000 #. -#. +#. #. #. @@ -19509,5 +19574,5 @@ #. 50000 #. -#. +#. #. #. @@ -19517,5 +19582,5 @@ #. 50000 #. -#. +#. #. #. @@ -19525,5 +19590,5 @@ #. 50000 #. -#. +#. #. #. @@ -19533,5 +19598,5 @@ #. 50000 #. -#. +#. #. #. @@ -19541,5 +19606,5 @@ #. 50000 #. -#. +#. #. #. @@ -19549,5 +19614,5 @@ #. 50000 #. -#. +#. #. #. @@ -19557,5 +19622,5 @@ #. 50000 #. -#. +#. #. #. @@ -19565,5 +19630,5 @@ #. 50000 #. -#. +#. #. #. @@ -19573,5 +19638,5 @@ #. 50000 #. -#. +#. #. #. @@ -19581,5 +19646,5 @@ #. 50000 #. -#. +#. #. #. @@ -19589,5 +19654,5 @@ #. 50000 #. -#. +#. #. #. @@ -21281,7 +21346,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -21291,5 +21356,5 @@ #. 50000 #. -#. +#. #. #. @@ -21299,5 +21364,5 @@ #. 50000 #. -#. +#. #. #. @@ -21307,5 +21372,5 @@ #. 50000 #. -#. +#. #. #. @@ -21315,5 +21380,5 @@ #. 50000 #. -#. +#. #. #. @@ -21323,5 +21388,5 @@ #. 50000 #. -#. +#. #. #. @@ -21331,5 +21396,5 @@ #. 50000 #. -#. +#. #. #. @@ -21339,5 +21404,5 @@ #. 50000 #. -#. +#. #. #. @@ -22668,5 +22733,5 @@ #. 40000 #. -#. +#. #. #. @@ -22682,5 +22747,5 @@ #. 30000 #. -#. +#. #. #. @@ -22691,7 +22756,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -22701,5 +22766,13 @@ #. 50000 #. -#. +#. +#. +#. +#. color bicycle +#. +#. 1 +#. 50000 +#. +#. #. #. @@ -22709,13 +22782,5 @@ #. 50000 #. -#. -#. -#. -#. color bicycle -#. -#. 1 -#. 50000 -#. -#. +#. #. #. @@ -22725,5 +22790,5 @@ #. 50000 #. -#. +#. #. #. @@ -22756,5 +22821,5 @@ #. 50000 #. -#. +#. #. #. @@ -22770,5 +22835,5 @@ #. 50000 #. -#. +#. #. #. @@ -22778,5 +22843,5 @@ #. 10000 #. -#. +#. #. #. @@ -22786,5 +22851,5 @@ #. 10000 #. -#. +#. #. #. @@ -22795,5 +22860,5 @@ #. 10000 #. -#. +#. #. #. @@ -22822,5 +22887,5 @@ #. 50000 #. -#. +#. #. #. @@ -22935,9 +23000,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 @@ -22945,5 +23010,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, @@ -22953,8 +23018,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 @@ -22968,5 +23033,5 @@ #. - when the style is additional choose "standard" or don't use name tag #. --> -#. +#. #: build/trans_style.java:72 msgid "standard" @@ -22974,5 +23039,5 @@ #. mappaint style named "standard" -#. +#. #. #. @@ -23021,6 +23086,6 @@ #. 40000 #. -#. -#. +#. +#. #. #. @@ -23100,5 +23165,5 @@ #. 40000 #. -#. +#. #. #. @@ -23108,5 +23173,5 @@ #. 10000 #. -#. +#. #. #. @@ -23115,5 +23180,5 @@ #. 50000 #. -#. +#. #. #. @@ -23123,5 +23188,5 @@ #. 50000 #. -#. +#. #. #. @@ -23130,5 +23195,5 @@ #. 50000 #. -#. +#. #. #. @@ -23137,5 +23202,5 @@ #. 50000 #. -#. +#. #. #. @@ -23144,5 +23209,5 @@ #. 50000 #. -#. +#. #. #. @@ -23151,5 +23216,5 @@ #. 50000 #. -#. +#. #. #. @@ -23158,5 +23223,5 @@ #. 40000 #. -#. +#. #. #. @@ -23165,5 +23230,5 @@ #. 50000 #. -#. +#. #. #. @@ -23172,5 +23237,5 @@ #. 50000 #. -#. +#. #. #. @@ -23179,5 +23244,5 @@ #. 50000 #. -#. +#. #. #. @@ -23186,5 +23251,5 @@ #. 50000 #. -#. +#. #. #. @@ -23193,5 +23258,5 @@ #. 50000 #. -#. +#. #. #. @@ -23200,5 +23265,5 @@ #. 50000 #. -#. +#. #. #. @@ -23208,5 +23273,5 @@ #. 50000 #. -#. +#. #. #. @@ -23215,5 +23280,5 @@ #. 50000 #. -#. +#. #. #. @@ -23224,5 +23289,5 @@ #. 50000 #. -#. +#. #. #. @@ -23234,11 +23299,11 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -23247,7 +23312,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23258,5 +23323,5 @@ #. 50000 #. -#. +#. #. #. @@ -23267,5 +23332,5 @@ #. 50000 #. -#. +#. #. #. @@ -23276,5 +23341,5 @@ #. 50000 #. -#. +#. #. #. @@ -23285,5 +23350,5 @@ #. 50000 #. -#. +#. #. #. @@ -23294,5 +23359,5 @@ #. 50000 #. -#. +#. #. #. @@ -23303,5 +23368,5 @@ #. 40000 #. -#. +#. #. #. @@ -23313,5 +23378,5 @@ #. 50000 #. -#. +#. #. #. @@ -23322,5 +23387,5 @@ #. 50000 #. -#. +#. #. #. @@ -23345,5 +23410,5 @@ #. 10000 #. -#. +#. #. #. @@ -23352,5 +23417,5 @@ #. 50000 #. -#. +#. #. #. @@ -23359,5 +23424,5 @@ #. 50000 #. -#. +#. #. #. @@ -23373,5 +23438,5 @@ #. 20000 #. -#. +#. #. #. @@ -23385,5 +23450,5 @@ #. 30000 #. -#. +#. #. #. @@ -23392,5 +23457,5 @@ #. 50000 #. -#. +#. #. #. @@ -23399,5 +23464,5 @@ #. 50000 #. -#. +#. #. #. @@ -23406,5 +23471,5 @@ #. 50000 #. -#. +#. #. #. @@ -23413,5 +23478,5 @@ #. 50000 #. -#. +#. #. #. @@ -23420,5 +23485,5 @@ #. 50000 #. -#. +#. #. #. @@ -23427,5 +23492,5 @@ #. 50000 #. -#. +#. #. #. @@ -23434,5 +23499,5 @@ #. 50000 #. -#. +#. #. #. @@ -23441,5 +23506,5 @@ #. 50000 #. -#. +#. #. #. @@ -23448,5 +23513,5 @@ #. 50000 #. -#. +#. #. #. @@ -23455,5 +23520,5 @@ #. 50000 #. -#. +#. #. #. @@ -23462,5 +23527,5 @@ #. 50000 #. -#. +#. #. #. @@ -23469,5 +23534,5 @@ #. 50000 #. -#. +#. #. #. @@ -23476,5 +23541,5 @@ #. 50000 #. -#. +#. #. #. @@ -23483,5 +23548,5 @@ #. 50000 #. -#. +#. #. #. @@ -23652,7 +23717,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23666,5 +23731,5 @@ #. 40000 #. -#. +#. #. #. @@ -23674,7 +23739,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23684,5 +23749,5 @@ #. 50000 #. -#. +#. #. #. @@ -23692,5 +23757,5 @@ #. 50000 #. -#. +#. #. #. @@ -23700,5 +23765,5 @@ #. 50000 #. -#. +#. #. #. @@ -23708,5 +23773,5 @@ #. 50000 #. -#. +#. #. #. @@ -23722,5 +23787,5 @@ #. 10000 #. -#. +#. #. #. @@ -23730,5 +23795,5 @@ #. 50000 #. -#. +#. #. #. @@ -23738,5 +23803,5 @@ #. 50000 #. -#. +#. #. #. @@ -23746,5 +23811,5 @@ #. 50000 #. -#. +#. #. #. @@ -23754,5 +23819,5 @@ #. 50000 #. -#. +#. #. #. @@ -23762,5 +23827,5 @@ #. 50000 #. -#. +#. #. #. @@ -23770,5 +23835,5 @@ #. 50000 #. -#. +#. #. #. @@ -23787,5 +23852,5 @@ #. 50000 #. -#. +#. #. #. @@ -23794,5 +23859,5 @@ #. 50000 #. -#. +#. #. #. @@ -23806,5 +23871,5 @@ #. 50000 #. -#. +#. #. #. @@ -23818,5 +23883,5 @@ #. 50000 #. -#. +#. #. #. @@ -23825,5 +23890,5 @@ #. 50000 #. -#. +#. #. #. @@ -23837,5 +23902,5 @@ #. 50000 #. -#. +#. #. #. @@ -23850,5 +23915,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23863,5 +23928,5 @@ #. 200000000 #. -#. +#. #. #. @@ -23875,5 +23940,5 @@ #. 50000 #. -#. +#. #. #. @@ -23887,5 +23952,5 @@ #. 50000 #. -#. +#. #. #. @@ -23894,5 +23959,5 @@ #. 50000 #. -#. +#. #. #. @@ -23901,5 +23966,5 @@ #. 50000 #. -#. +#. #. #. @@ -23913,5 +23978,5 @@ #. 50000 #. -#. +#. #. #. @@ -23921,5 +23986,5 @@ #. 50000 #. -#. +#. #. #. @@ -23928,5 +23993,5 @@ #. 50000 #. -#. +#. #. #. @@ -23935,5 +24000,5 @@ #. 50000 #. -#. +#. #. #. @@ -23942,5 +24007,5 @@ #. 50000 #. -#. +#. #. #. @@ -23950,5 +24015,5 @@ #. 50000 #. -#. +#. #. #. @@ -23959,5 +24024,5 @@ #. 50000 #. -#. +#. #. #. @@ -23967,7 +24032,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -23977,5 +24042,5 @@ #. 50000 #. -#. +#. #. #. @@ -23985,5 +24050,5 @@ #. 50000 #. -#. +#. #. #. @@ -23993,5 +24058,5 @@ #. 50000 #. -#. +#. #. #. @@ -24002,5 +24067,5 @@ #. 50000 #. -#. +#. #. #. @@ -24010,5 +24075,5 @@ #. 50000 #. -#. +#. #. #. @@ -24018,5 +24083,5 @@ #. 50000 #. -#. +#. #. #. @@ -24026,5 +24091,5 @@ #. 50000 #. -#. +#. #. #. @@ -24034,5 +24099,5 @@ #. 50000 #. -#. +#. #. #. @@ -24042,5 +24107,5 @@ #. 50000 #. -#. +#. #. #. @@ -24050,5 +24115,5 @@ #. 50000 #. -#. +#. #. #. @@ -24058,5 +24123,5 @@ #. 50000 #. -#. +#. #. #. @@ -24066,5 +24131,5 @@ #. 50000 #. -#. +#. #. #. @@ -24087,7 +24152,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24097,5 +24162,5 @@ #. 50000 #. -#. +#. #. #. @@ -24104,5 +24169,5 @@ #. 50000 #. -#. +#. #. #. @@ -24112,5 +24177,5 @@ #. 50000 #. -#. +#. #. #. @@ -24119,5 +24184,5 @@ #. 50000 #. -#. +#. #. #. @@ -24127,5 +24192,5 @@ #. 50000 #. -#. +#. #. #. @@ -24135,5 +24200,5 @@ #. 50000 #. -#. +#. #. #. @@ -24149,5 +24214,5 @@ #. 200000000 #. -#. +#. #. #. @@ -24158,5 +24223,5 @@ #. 50000 #. -#. +#. #. #. @@ -24175,5 +24240,5 @@ #. 50000 #. -#. +#. #. #. @@ -24183,5 +24248,5 @@ #. 50000 #. -#. +#. #. #. @@ -24194,5 +24259,5 @@ #. 50000 #. -#. +#. #. #. @@ -24210,5 +24275,5 @@ #. 50000 #. -#. +#. #. #. @@ -24217,5 +24282,5 @@ #. 50000 #. -#. +#. #. #. @@ -24224,5 +24289,5 @@ #. 50000 #. -#. +#. #. #. @@ -24231,7 +24296,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24242,5 +24307,5 @@ #. 50000 #. -#. +#. #. #. @@ -24255,5 +24320,5 @@ #. 50000 #. -#. +#. #. #. @@ -24267,5 +24332,5 @@ #. 50000 #. -#. +#. #. #. @@ -24275,5 +24340,5 @@ #. 50000 #. -#. +#. #. #. @@ -24287,5 +24352,5 @@ #. 50000 #. -#. +#. #. #. @@ -24299,5 +24364,5 @@ #. 50000 #. -#. +#. #. #. @@ -24306,7 +24371,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24316,5 +24381,5 @@ #. 50000 #. -#. +#. #. #. @@ -24324,5 +24389,5 @@ #. 50000 #. -#. +#. #. #. @@ -24332,5 +24397,5 @@ #. 50000 #. -#. +#. #. #. @@ -24340,5 +24405,5 @@ #. 50000 #. -#. +#. #. #. @@ -24354,7 +24419,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24369,5 +24434,5 @@ #. 30000 #. -#. +#. #. #. @@ -24382,5 +24447,5 @@ #. 30000 #. -#. +#. #. #. @@ -24395,5 +24460,5 @@ #. 30000 #. -#. +#. #. #. @@ -24408,5 +24473,5 @@ #. 30000 #. -#. +#. #. #. @@ -24421,5 +24486,5 @@ #. 30000 #. -#. +#. #. #. @@ -24434,7 +24499,7 @@ #. 300000 #. -#. +#. #. -#. +#. #. #. @@ -24444,5 +24509,5 @@ #. 50000 #. -#. +#. #. #. @@ -24451,5 +24516,5 @@ #. 50000 #. -#. +#. #. #. @@ -24459,5 +24524,5 @@ #. 50000 #. -#. +#. #. #. @@ -24467,5 +24532,5 @@ #. 50000 #. -#. +#. #. #. @@ -24475,5 +24540,5 @@ #. 50000 #. -#. +#. #. #. @@ -24483,5 +24548,5 @@ #. 50000 #. -#. +#. #. #. @@ -24491,5 +24556,5 @@ #. 50000 #. -#. +#. #. #. @@ -24499,5 +24564,5 @@ #. 50000 #. -#. +#. #. #. @@ -24507,5 +24572,5 @@ #. 50000 #. -#. +#. #. #. @@ -24515,5 +24580,5 @@ #. 50000 #. -#. +#. #. #. @@ -24523,5 +24588,5 @@ #. 50000 #. -#. +#. #. #. @@ -24531,5 +24596,5 @@ #. 50000 #. -#. +#. #. #. @@ -24539,5 +24604,5 @@ #. 50000 #. -#. +#. #. #. @@ -24557,5 +24622,5 @@ #. 50000 #. -#. +#. #. #. @@ -24570,5 +24635,5 @@ #. 50000 #. -#. +#. #. #. @@ -24581,7 +24646,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24591,5 +24656,5 @@ #. 50000 #. -#. +#. #. #. @@ -24599,5 +24664,5 @@ #. 50000 #. -#. +#. #. #. @@ -24607,5 +24672,5 @@ #. 50000 #. -#. +#. #. #. @@ -24615,5 +24680,5 @@ #. 50000 #. -#. +#. #. #. @@ -24623,5 +24688,5 @@ #. 50000 #. -#. +#. #. #. @@ -24631,5 +24696,5 @@ #. 50000 #. -#. +#. #. #. @@ -24639,5 +24704,5 @@ #. 50000 #. -#. +#. #. #. @@ -24647,5 +24712,5 @@ #. 50000 #. -#. +#. #. #. @@ -24655,5 +24720,5 @@ #. 50000 #. -#. +#. #. #. @@ -24663,5 +24728,5 @@ #. 50000 #. -#. +#. #. #. @@ -24671,5 +24736,5 @@ #. 50000 #. -#. +#. #. #. @@ -24679,5 +24744,5 @@ #. 50000 #. -#. +#. #. #. @@ -24687,5 +24752,5 @@ #. 50000 #. -#. +#. #. #. @@ -24695,5 +24760,5 @@ #. 50000 #. -#. +#. #. #. @@ -24714,5 +24779,5 @@ #. 50000 #. -#. +#. #. #. @@ -24726,7 +24791,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -24736,5 +24801,5 @@ #. 50000 #. -#. +#. #. #. @@ -24744,5 +24809,5 @@ #. 50000 #. -#. +#. #. #. @@ -24752,5 +24817,5 @@ #. 50000 #. -#. +#. #. #. @@ -24760,5 +24825,5 @@ #. 50000 #. -#. +#. #. #. @@ -24768,5 +24833,5 @@ #. 50000 #. -#. +#. #. #. @@ -24776,5 +24841,5 @@ #. 50000 #. -#. +#. #. #. @@ -24784,5 +24849,5 @@ #. 50000 #. -#. +#. #. #. @@ -24799,5 +24864,5 @@ #. 50000 #. -#. +#. #. #. @@ -24807,5 +24872,5 @@ #. 50000 #. -#. +#. #. #. @@ -24815,5 +24880,5 @@ #. 50000 #. -#. +#. #. #. @@ -24823,5 +24888,5 @@ #. 50000 #. -#. +#. #. #. @@ -24831,5 +24896,5 @@ #. 50000 #. -#. +#. #. #. @@ -24839,5 +24904,5 @@ #. 50000 #. -#. +#. #. #. @@ -24847,5 +24912,5 @@ #. 50000 #. -#. +#. #. #. @@ -24855,5 +24920,5 @@ #. 50000 #. -#. +#. #. #. @@ -24863,5 +24928,5 @@ #. 50000 #. -#. +#. #. #. @@ -24871,5 +24936,5 @@ #. 50000 #. -#. +#. #. #. @@ -24879,5 +24944,5 @@ #. 50000 #. -#. +#. #. #. @@ -24887,5 +24952,5 @@ #. 50000 #. -#. +#. #. #. @@ -24904,5 +24969,5 @@ #. 50000 #. -#. +#. #. #. @@ -24912,5 +24977,5 @@ #. 50000 #. -#. +#. #. #. @@ -24919,5 +24984,5 @@ #. 50000 #. -#. +#. #. #. @@ -24927,5 +24992,5 @@ #. 50000 #. -#. +#. #. #. @@ -24935,5 +25000,5 @@ #. 50000 #. -#. +#. #. #. @@ -24943,5 +25008,5 @@ #. 50000 #. -#. +#. #. #. @@ -24950,5 +25015,5 @@ #. 50000 #. -#. +#. #. #. @@ -24958,5 +25023,5 @@ #. 50000 #. -#. +#. #. #. @@ -24966,5 +25031,5 @@ #. 50000 #. -#. +#. #. #. @@ -24974,5 +25039,5 @@ #. 50000 #. -#. +#. #. #. @@ -24982,5 +25047,5 @@ #. 50000 #. -#. +#. #. #. @@ -24989,5 +25054,5 @@ #. 50000 #. -#. +#. #. #. @@ -24996,5 +25061,5 @@ #. 50000 #. -#. +#. #. #. @@ -25003,5 +25068,5 @@ #. 50000 #. -#. +#. #. #. @@ -25010,5 +25075,5 @@ #. 50000 #. -#. +#. #. #. @@ -25017,5 +25082,5 @@ #. 50000 #. -#. +#. #. #. @@ -25024,5 +25089,5 @@ #. 50000 #. -#. +#. #. #. @@ -25031,5 +25096,5 @@ #. 50000 #. -#. +#. #. #. @@ -25038,5 +25103,5 @@ #. 50000 #. -#. +#. #. #. @@ -25045,5 +25110,5 @@ #. 50000 #. -#. +#. #. #. @@ -25052,5 +25117,5 @@ #. 50000 #. -#. +#. #. #. @@ -25059,5 +25124,5 @@ #. 50000 #. -#. +#. #. #. @@ -25066,5 +25131,5 @@ #. 50000 #. -#. +#. #. #. @@ -25073,5 +25138,5 @@ #. 50000 #. -#. +#. #. #. @@ -25081,5 +25146,5 @@ #. 50000 #. -#. +#. #. #. @@ -25089,5 +25154,5 @@ #. 50000 #. -#. +#. #. #. @@ -25097,5 +25162,5 @@ #. 50000 #. -#. +#. #. #. @@ -25105,5 +25170,5 @@ #. 50000 #. -#. +#. #. #. @@ -25113,5 +25178,5 @@ #. 50000 #. -#. +#. #. #. @@ -25121,5 +25186,5 @@ #. 50000 #. -#. +#. #. #. @@ -25129,5 +25194,5 @@ #. 50000 #. -#. +#. #. #. @@ -25137,5 +25202,5 @@ #. 50000 #. -#. +#. #. #. @@ -25145,5 +25210,5 @@ #. 50000 #. -#. +#. #. #. @@ -25154,5 +25219,5 @@ #. 50000 #. -#. +#. #. #. @@ -25162,5 +25227,5 @@ #. 50000 #. -#. +#. #. #. @@ -25170,5 +25235,5 @@ #. 50000 #. -#. +#. #. #. @@ -25178,5 +25243,5 @@ #. 50000 #. -#. +#. #. #. @@ -25186,5 +25251,5 @@ #. 50000 #. -#. +#. #. #. @@ -25194,5 +25259,5 @@ #. 50000 #. -#. +#. #. #. @@ -25202,5 +25267,5 @@ #. 50000 #. -#. +#. #. #. @@ -25210,5 +25275,5 @@ #. 50000 #. -#. +#. #. #. @@ -25218,5 +25283,5 @@ #. 50000 #. -#. +#. #. #. @@ -25226,5 +25291,5 @@ #. 50000 #. -#. +#. #. #. @@ -25234,5 +25299,5 @@ #. 50000 #. -#. +#. #. #. @@ -25242,5 +25307,5 @@ #. 50000 #. -#. +#. #. #. @@ -25250,5 +25315,5 @@ #. 50000 #. -#. +#. #. #. @@ -25258,5 +25323,5 @@ #. 50000 #. -#. +#. #. #. @@ -25266,5 +25331,5 @@ #. 50000 #. -#. +#. #. #. @@ -25274,5 +25339,5 @@ #. 50000 #. -#. +#. #. #. @@ -25282,5 +25347,5 @@ #. 50000 #. -#. +#. #. #. @@ -25290,5 +25355,5 @@ #. 50000 #. -#. +#. #. #. @@ -25298,5 +25363,5 @@ #. 50000 #. -#. +#. #. #. @@ -25305,5 +25370,5 @@ #. 50000 #. -#. +#. #. #. @@ -25335,5 +25400,5 @@ #. 50000 #. -#. +#. #. #. @@ -25343,5 +25408,5 @@ #. 50000 #. -#. +#. #. #. @@ -25351,7 +25416,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25366,5 +25431,5 @@ #. 50000 #. -#. +#. #. #. @@ -25374,5 +25439,5 @@ #. 50000 #. -#. +#. #. #. @@ -25382,5 +25447,5 @@ #. 50000 #. -#. +#. #. #. @@ -25390,5 +25455,5 @@ #. 50000 #. -#. +#. #. #. @@ -25398,5 +25463,5 @@ #. 50000 #. -#. +#. #. #. @@ -25406,5 +25471,5 @@ #. 50000 #. -#. +#. #. #. @@ -25414,5 +25479,5 @@ #. 50000 #. -#. +#. #. #. @@ -25428,7 +25493,7 @@ #. 40000 #. -#. +#. #. -#. +#. #. #. @@ -25438,5 +25503,5 @@ #. 50000 #. -#. +#. #. #. @@ -25446,5 +25511,5 @@ #. 50000 #. -#. +#. #. #. @@ -25454,5 +25519,5 @@ #. 50000 #. -#. +#. #. #. @@ -25462,5 +25527,5 @@ #. 50000 #. -#. +#. #. #. @@ -25470,5 +25535,5 @@ #. 50000 #. -#. +#. #. #. @@ -25478,5 +25543,5 @@ #. 50000 #. -#. +#. #. #. @@ -25486,5 +25551,5 @@ #. 50000 #. -#. +#. #. #. @@ -25494,5 +25559,5 @@ #. 50000 #. -#. +#. #. #. @@ -25502,5 +25567,5 @@ #. 50000 #. -#. +#. #. #. @@ -25510,5 +25575,5 @@ #. 50000 #. -#. +#. #. #. @@ -25518,5 +25583,5 @@ #. 50000 #. -#. +#. #. #. @@ -25526,5 +25591,5 @@ #. 50000 #. -#. +#. #. #. @@ -25534,5 +25599,5 @@ #. 50000 #. -#. +#. #. #. @@ -25542,5 +25607,5 @@ #. 50000 #. -#. +#. #. #. @@ -25550,5 +25615,5 @@ #. 50000 #. -#. +#. #. #. @@ -25558,5 +25623,5 @@ #. 50000 #. -#. +#. #. #. @@ -25566,5 +25631,5 @@ #. 50000 #. -#. +#. #. #. @@ -25574,5 +25639,5 @@ #. 50000 #. -#. +#. #. #. @@ -25582,5 +25647,5 @@ #. 50000 #. -#. +#. #. #. @@ -25590,5 +25655,5 @@ #. 50000 #. -#. +#. #. #. @@ -25598,5 +25663,5 @@ #. 50000 #. -#. +#. #. #. @@ -25606,5 +25671,5 @@ #. 50000 #. -#. +#. #. #. @@ -25614,5 +25679,5 @@ #. 50000 #. -#. +#. #. #. @@ -25622,5 +25687,5 @@ #. 50000 #. -#. +#. #. #. @@ -25630,5 +25695,5 @@ #. 50000 #. -#. +#. #. #. @@ -25638,5 +25703,5 @@ #. 50000 #. -#. +#. #. #. @@ -25646,5 +25711,5 @@ #. 50000 #. -#. +#. #. #. @@ -25654,5 +25719,5 @@ #. 50000 #. -#. +#. #. #. @@ -25662,5 +25727,5 @@ #. 50000 #. -#. +#. #. #. @@ -25670,5 +25735,5 @@ #. 50000 #. -#. +#. #. #. @@ -25678,5 +25743,5 @@ #. 50000 #. -#. +#. #. #. @@ -25686,5 +25751,5 @@ #. 50000 #. -#. +#. #. #. @@ -25694,5 +25759,5 @@ #. 50000 #. -#. +#. #. #. @@ -25702,5 +25767,5 @@ #. 50000 #. -#. +#. #. #. @@ -25710,5 +25775,5 @@ #. 50000 #. -#. +#. #. #. @@ -25718,5 +25783,5 @@ #. 50000 #. -#. +#. #. #. @@ -25726,5 +25791,5 @@ #. 50000 #. -#. +#. #. #. @@ -25734,5 +25799,5 @@ #. 50000 #. -#. +#. #. #. @@ -25742,5 +25807,5 @@ #. 50000 #. -#. +#. #. #. @@ -25750,5 +25815,5 @@ #. 50000 #. -#. +#. #. #. @@ -25758,5 +25823,5 @@ #. 50000 #. -#. +#. #. #. @@ -25766,5 +25831,5 @@ #. 50000 #. -#. +#. #. #. @@ -25800,7 +25865,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25810,5 +25875,5 @@ #. 50000 #. -#. +#. #. #. @@ -25818,5 +25883,5 @@ #. 50000 #. -#. +#. #. #. @@ -25826,5 +25891,5 @@ #. 50000 #. -#. +#. #. #. @@ -25834,5 +25899,5 @@ #. 50000 #. -#. +#. #. #. @@ -25842,5 +25907,5 @@ #. 50000 #. -#. +#. #. #. @@ -25850,5 +25915,5 @@ #. 50000 #. -#. +#. #. #. @@ -25858,5 +25923,5 @@ #. 50000 #. -#. +#. #. #. @@ -25873,5 +25938,5 @@ #. 50000 #. -#. +#. #. #. @@ -25881,5 +25946,5 @@ #. 50000 #. -#. +#. #. #. @@ -25889,5 +25954,5 @@ #. 50000 #. -#. +#. #. #. @@ -25897,5 +25962,5 @@ #. 50000 #. -#. +#. #. #. @@ -25905,5 +25970,5 @@ #. 50000 #. -#. +#. #. #. @@ -25913,5 +25978,5 @@ #. 50000 #. -#. +#. #. #. @@ -25922,5 +25987,5 @@ #. 50000 #. -#. +#. #. #. @@ -25930,5 +25995,5 @@ #. 50000 #. -#. +#. #. #. @@ -25938,5 +26003,5 @@ #. 40000 #. -#. +#. #. #. @@ -25946,5 +26011,5 @@ #. 50000 #. -#. +#. #. #. @@ -25953,5 +26018,5 @@ #. 40000 #. -#. +#. #. #. @@ -25960,5 +26025,5 @@ #. 40000 #. -#. +#. #. #. @@ -25976,7 +26041,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -25986,5 +26051,5 @@ #. 50000 #. -#. +#. #. #. @@ -25994,5 +26059,5 @@ #. 50000 #. -#. +#. #. #. @@ -26002,5 +26067,5 @@ #. 50000 #. -#. +#. #. #. @@ -26010,5 +26075,5 @@ #. 50000 #. -#. +#. #. #. @@ -26018,5 +26083,5 @@ #. 50000 #. -#. +#. #. #. @@ -26026,5 +26091,5 @@ #. 50000 #. -#. +#. #. #. @@ -26034,5 +26099,5 @@ #. 50000 #. -#. +#. #. #. @@ -26042,5 +26107,5 @@ #. 50000 #. -#. +#. #. #. @@ -26050,5 +26115,5 @@ #. 50000 #. -#. +#. #. #. @@ -26067,5 +26132,5 @@ #. 50000 #. -#. +#. #. #. @@ -26079,5 +26144,5 @@ #. 50000 #. -#. +#. #. #. @@ -26091,5 +26156,5 @@ #. 50000 #. -#. +#. #. #. @@ -26099,5 +26164,5 @@ #. 50000 #. -#. +#. #. #. @@ -26111,5 +26176,5 @@ #. 50000 #. -#. +#. #. #. @@ -26123,5 +26188,5 @@ #. 50000 #. -#. +#. #. #. @@ -26135,6 +26200,6 @@ #. 50000 #. -#. -#. +#. +#. #. #. @@ -26144,5 +26209,5 @@ #. 50000 #. -#. +#. #. #. @@ -26156,5 +26221,5 @@ #. 50000 #. -#. +#. #. #. @@ -26168,5 +26233,5 @@ #. 50000 #. -#. +#. #. #. @@ -26180,5 +26245,5 @@ #. 50000 #. -#. +#. #. #. @@ -26192,5 +26257,5 @@ #. 50000 #. -#. +#. #. #. @@ -26204,5 +26269,5 @@ #. 50000 #. -#. +#. #. #. @@ -26212,7 +26277,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26222,5 +26287,5 @@ #. 50000 #. -#. +#. #. #. @@ -26230,5 +26295,5 @@ #. 50000 #. -#. +#. #. #. @@ -26238,5 +26303,5 @@ #. 50000 #. -#. +#. #. #. @@ -26246,5 +26311,5 @@ #. 50000 #. -#. +#. #. #. @@ -26261,5 +26326,5 @@ #. 50000 #. -#. +#. #. #. @@ -26272,5 +26337,5 @@ #. 50000 #. -#. +#. #. #. @@ -26284,5 +26349,5 @@ #. 50000 #. -#. +#. #. #. @@ -26296,5 +26361,5 @@ #. 50000 #. -#. +#. #. #. @@ -26308,5 +26373,5 @@ #. 50000 #. -#. +#. #. #. @@ -26317,5 +26382,5 @@ #. 50000 #. -#. +#. #. #. @@ -26325,5 +26390,5 @@ #. 50000 #. -#. +#. #. #. @@ -26333,5 +26398,5 @@ #. 50000 #. -#. +#. #. #. @@ -26341,5 +26406,5 @@ #. 50000 #. -#. +#. #. #. @@ -26349,5 +26414,5 @@ #. 50000 #. -#. +#. #. #. @@ -26364,5 +26429,5 @@ #. 50000 #. -#. +#. #. #. @@ -26376,5 +26441,5 @@ #. 50000 #. -#. +#. #. #. @@ -26388,5 +26453,5 @@ #. 50000 #. -#. +#. #. #. @@ -26400,5 +26465,5 @@ #. 50000 #. -#. +#. #. #. @@ -26412,5 +26477,5 @@ #. 50000 #. -#. +#. #. #. @@ -26424,5 +26489,5 @@ #. 50000 #. -#. +#. #. #. @@ -26431,7 +26496,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26441,5 +26506,5 @@ #. 50000 #. -#. +#. #. #. @@ -26449,5 +26514,5 @@ #. 50000 #. -#. +#. #. #. @@ -26457,5 +26522,5 @@ #. 50000 #. -#. +#. #. #. @@ -26465,5 +26530,5 @@ #. 50000 #. -#. +#. #. #. @@ -26473,5 +26538,5 @@ #. 50000 #. -#. +#. #. #. @@ -26481,5 +26546,5 @@ #. 50000 #. -#. +#. #. #. @@ -26489,5 +26554,5 @@ #. 50000 #. -#. +#. #. #. @@ -26504,7 +26569,7 @@ #. 50000 #. -#. +#. #. -#. +#. #. #. @@ -26514,5 +26579,5 @@ #. 50000 #. -#. +#. #. #. @@ -26522,5 +26587,5 @@ #. 50000 #. -#. +#. #. #. @@ -26530,5 +26595,5 @@ #. 50000 #. -#. +#. #. #. @@ -26538,5 +26603,5 @@ #. 50000 #. -#. +#. #. #. @@ -26552,5 +26617,5 @@ #. 50000 #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. -#. +#. #. #. @@ -26599,5 +26664,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26607,5 +26672,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26615,5 +26680,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26623,5 +26688,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26631,5 +26696,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26639,5 +26704,5 @@ #. 200000000 #. -#. +#. #. #. @@ -26647,5 +26712,5 @@ #. 50000 #. -#. +#. #. #. @@ -26655,5 +26720,5 @@ #. 50000 #. -#. +#. #. #. @@ -26663,5 +26728,5 @@ #. 50000 #. -#. +#. #. #. @@ -26671,5 +26736,5 @@ #. 50000 #. -#. +#. #. #. @@ -26679,5 +26744,5 @@ #. 50000 #. -#. +#. #. #. @@ -26687,5 +26752,5 @@ #. 50000 #. -#. +#. #. #. @@ -26705,5 +26770,5 @@ #. 50000 #. -#. +#. #. #. @@ -26712,5 +26777,5 @@ #. 50000 #. -#. +#. #. #. @@ -26719,5 +26784,5 @@ #. 50000 #. -#. +#. #. #. @@ -26726,5 +26791,5 @@ #. 40000 #. -#. +#. #. #. @@ -26733,5 +26798,5 @@ #. 40000 #. -#. +#. #. #. @@ -26740,5 +26805,5 @@ #. 40000 #. -#. +#. #. #. @@ -26833,5 +26898,5 @@ #. Each line specifies a certain error to be reported #. : messagetype : -#. +#. #. Data type can be: #. node - a node point @@ -26839,28 +26904,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 @@ -26975,5 +27040,5 @@ #. default(true or false);Name;URL #. NOTE: default items should be common and worldwide -#. +#. #: build/trans_wms.java:5 msgid "Landsat" @@ -26986,5 +27051,5 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. +#. #. different forms for web access #. must be html: @@ -27009,6 +27074,6 @@ #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? -#. -#. +#. +#. #. only for Germany #: build/trans_wms.java:17 @@ -27017,6 +27082,6 @@ #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? -#. -#. +#. +#. #. only for North America #. Terraserver USCG - High resolution maps @@ -27031,6 +27096,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 @@ -27044,6 +27109,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 @@ -27063,6 +27128,6 @@ #. http://ooc.openstreetmap.org/wms/map.php?source=os7& -#. -#. +#. +#. #. only for Japan #: build/trans_wms.java:39 @@ -27086,6 +27151,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 @@ -27098,4 +27163,84 @@ msgstr "" +#~ msgid "" +#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#~ msgstr "無法取消指令「{0}」，因為圖層「{1}」已不存在" + +#~ 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 "不能讀取點 {1} x {2} 的時刻「{0}」" + +#~ msgid "No images with readable timestamps found." +#~ msgstr "找不到具可讀時刻戳記的圖片。" + +#~ msgid "GPS start: {0}" +#~ msgstr "GPS 開始：{0}" + +#~ msgid "GPS end: {0}" +#~ msgstr "GPS 結束：{0}" + +#~ msgid "current delta: {0}s" +#~ msgstr "目前的差分： {0}秒" + +#~ msgid "timezone difference: " +#~ msgstr "時區差異： " + +#~ msgid "{0} within the track." +#~ msgstr "{0} 在此軌跡中。" + +#~ msgid "Sync clock" +#~ msgstr "同步時鐘" + +#~ msgid "The date in file \"{0}\" could not be parsed." +#~ msgstr "檔案「{0}」的日期無法解析。" + +#~ msgid "There is no EXIF time within the file \"{0}\"." +#~ msgstr "在檔案「{0}」中沒有 EXIF 時刻。" + +#~ msgid "Image" +#~ msgstr "圖片" + +#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +#~ msgstr "輸入要顯示的日期 (mm/dd/yyyy HH:MM:SS)" + +#~ msgid "GPS unit timezone (difference to photo)" +#~ msgstr "GPS 單元時區 (不同於照片)" + +#~ msgid "Synchronize Time with GPS Unit" +#~ msgstr "與 GPS 單元同步時刻" + +#~ msgid "Time entered could not be parsed." +#~ msgstr "輸入的時刻無法解析。" + +#~ msgid "AgPifoJ - Geotagged pictures" +#~ msgstr "AgPifoJ - 有 Geotag 的相片" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "以 AgPifoJ 開啟圖片..." + +#~ msgid "osmarender options" +#~ msgstr "osmarender 選項" + +#~ msgid "" +#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " +#~ "import EXIF geotagged pictures." +#~ msgstr "" +#~ "JOSM 的另一個 geotag 外掛程式。將相片與 GPS 軌跡關聯或匯入 EXIF 已有 " +#~ "geotag 的相片。" + +#~ msgid "" +#~ "Several utilities that make your life easier: e.g. simplify way, join " +#~ "areas, jump to position." +#~ msgstr "" +#~ "許多能讓您的生活更輕鬆的公用程式：例如簡化路徑、連結區域、跳至位置。" + #~ msgid "File could not be found." #~ msgstr "找不到檔案" @@ -27126,6 +27271,6 @@ #~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want to " -#~ "combine them?" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "選取的路徑有不同的關係成員。是否仍要將它們組合？" @@ -27139,5 +27284,4 @@ #~ msgstr "只能在 JOSM 線上求助中編輯求助頁面" -#, java-format #~ msgid "Error while loading page {0}" #~ msgstr "載入頁面 {0} 時發生錯誤" @@ -27150,6 +27294,6 @@ #~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still want " -#~ "to merge them?" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" #~ msgstr "選取的節點有不同的關係成員。是否仍要合併它們？" @@ -27173,6 +27317,6 @@ #~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this as " -#~ "a bug." +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." #~ msgstr "內部的錯誤：不能檢查無圖層的條件。請將它回報為程式錯誤。" @@ -27181,5 +27325,6 @@ #~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data layer?" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "找不到要更新的資料。您是否已經開啟或下載過資料圖層？" @@ -27204,8 +27349,4 @@ #~ msgid "Data Layer" #~ msgstr "資料圖層" - -#, java-format -#~ msgid "Delete {1} {0}" -#~ msgstr "刪除 {1} {0}" #~ msgid "Conflicting relation" @@ -27249,9 +27390,7 @@ #~ msgstr "正在合併衝突。" -#, java-format #~ msgid "Conflicts: {0}" #~ msgstr "衝突： {0}" -#, java-format #~ msgid "Layers: {0}" #~ msgstr "圖層：{0}" @@ -27284,5 +27423,4 @@ #~ msgstr "公開" -#, java-format #~ msgid "Cannot open preferences directory: {0}" #~ msgstr "不能開啓偏好設定目錄：{0}" @@ -27300,5 +27438,4 @@ #~ msgstr "編輯屬性" -#, java-format #~ msgid "Authors: {0}" #~ msgstr "作者：{0}" @@ -27310,5 +27447,4 @@ #~ msgstr "移陳選取的" -#, java-format #~ msgid "Relation Editor: {0}" #~ msgstr "關係編輯器：{0}" @@ -27323,7 +27459,4 @@ #~ msgstr "與伺服器連線時發生錯誤。" -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "請先輸入想要的坐標。" - #~ msgid "Select a bookmark first." #~ msgstr "先選擇一個書籤。" @@ -27332,5 +27465,4 @@ #~ msgstr "請輸入搜尋字串" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27346,5 +27478,4 @@ #~ "看到此訊息後請勿上傳任何資料。" -#, java-format #~ msgid "" #~ "The projection \"{0}\" is designed for\n" @@ -27372,6 +27503,6 @@ #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." #~ msgstr "" -#~ "標籤預設組合定義檔案的來源（URL 或檔案名稱）。請查閱 " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets 的說明。" +#~ "標籤預設組合定義檔案的來源（URL 或檔案名稱）。請查閱 http://josm." +#~ "openstreetmap.de/wiki/TaggingPresets 的說明。" #~ msgid "Add a new tagging preset source to the list." @@ -27402,5 +27533,4 @@ #~ msgstr "OSM 資料缺少版本編號" -#, java-format #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." #~ msgstr "關係 {1} 的成員 {0} 有未預期的「type」，得到 {2}。" @@ -27414,5 +27544,7 @@ #~ "(You can change the number of days after which this warning appears
by " #~ "setting the config option 'pluginmanager.warntime'.)" -#~ msgstr "(您可以設定這個警告每隔幾天出現，
只要設定選項「pluginmanager.warntime」。)" +#~ msgstr "" +#~ "(您可以設定這個警告每隔幾天出現，
只要設定選項「pluginmanager." +#~ "warntime」。)" #~ msgid "Found element in non-way." @@ -27422,5 +27554,4 @@ #~ msgstr "在非-關係中發現 元件。" -#, java-format #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "忽略路徑，因為它包含不存在的節點：{0}\n" @@ -27430,6 +27561,6 @@ #~ msgid "" -#~ "Try updating to the newest version of JOSM and all plugins before reporting " -#~ "a bug." +#~ "Try updating to the newest version of JOSM and all plugins before " +#~ "reporting a bug." #~ msgstr "在回報錯誤前請先試著更新到最新版的 JOSM 與所有外掛程式。" @@ -27467,13 +27598,10 @@ #~ msgstr "檢驗目前的選擇區域或整個資料組合。" -#, java-format #~ msgid "Please report a ticket at {0}" #~ msgstr "請在 {0} 回報為 ticket" -#, java-format #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "使用群組「{1}」的預設組合「{0}」" -#, java-format #~ msgid "Use preset ''{0}''" #~ msgstr "使用預設組合「{0}」" @@ -27488,5 +27616,4 @@ #~ msgstr "蘭勃特區 2 快取檔案 (.2)" -#, java-format #~ msgid "Change the projection to {0} first." #~ msgstr "先將投影改變為 {0}。" @@ -27498,5 +27625,4 @@ #~ msgstr "載入中繼資料時發生錯誤" -#, java-format #~ msgid "requested: {0}" #~ msgstr "要求的：{0}" @@ -27536,6 +27662,6 @@ #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " -#~ "these will then show up in the WMS menu.\n" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" #~ "\n" #~ "You can also do this manually in the Advanced Preferences, using the " @@ -27551,6 +27677,6 @@ #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " #~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in " -#~ "this example, replacing 73 with your image id:\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -27559,5 +27685,6 @@ #~ "use." #~ msgstr "" -#~ "您可以在 WMSplugin 偏好設定分頁中加入、編輯和刪除 WMS 項目 - 然後這些就會在 WMS 選單中顯示出來。\n" +#~ "您可以在 WMSplugin 偏好設定分頁中加入、編輯和刪除 WMS 項目 - 然後這些就會" +#~ "在 WMS 選單中顯示出來。\n" #~ "\n" #~ "您也可以在進階偏好設定中手動完成它，使用下列配置：\n" @@ -27570,6 +27697,8 @@ #~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" #~ "\n" -#~ "以 Metacarta 的地圖修正器 http://labs.metacarta.com/rectifier/ 來說，您只需要輸入相對的「id」。\n" -#~ "要加入 Metacarta 地圖修正器選單項目，手動建立如這個範例的 URL，並將 73 換成您的圖片 id：\n" +#~ "以 Metacarta 的地圖修正器 http://labs.metacarta.com/rectifier/ 來說，您只" +#~ "需要輸入相對的「id」。\n" +#~ "要加入 Metacarta 地圖修正器選單項目，手動建立如這個範例的 URL，並將 73 換" +#~ "成您的圖片 id：\n" #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" @@ -27587,7 +27716,9 @@ #~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to selected " -#~ "user, opens browser showing selected author profile page." -#~ msgstr "與作者/使用者相關的工具。選擇屬於選取的使用者的地圖資料，開啟瀏覽器顯示選取的作者個人資料頁面。" +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." +#~ msgstr "" +#~ "與作者/使用者相關的工具。選擇屬於選取的使用者的地圖資料，開啟瀏覽器顯示選" +#~ "取的作者個人資料頁面。" #~ msgid "API initialization failed" @@ -27642,15 +27773,14 @@ #~ msgstr "要求更新發生錯誤：不縮放-等級 12" -#, java-format #~ msgid "Help page missing. Create it in English." #~ msgstr "求助頁面遺失。以 English 建立它。" -#, java-format #~ msgid "" -#~ "Help page missing. Create it in English or your language." -#~ msgstr "求助頁面遺失。以 English 或 您的語言建立它。" - -#, java-format +#~ "Help page missing. Create it in English or your language." +#~ msgstr "" +#~ "求助頁面遺失。以 English 或 您的語言建立它。" + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "未預期的回傳值。得到 {0}"