Index: applications/editors/josm/i18n/po/et.po =================================================================== --- applications/editors/josm/i18n/po/et.po (revision 17485) +++ applications/editors/josm/i18n/po/et.po (revision 17595) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-06 13:51+0200\n" -"PO-Revision-Date: 2009-08-27 13:04+0000\n" +"POT-Creation-Date: 2009-09-12 18:11+0200\n" +"PO-Revision-Date: 2009-09-06 13:16+0000\n" "Last-Translator: lyyser \n" "Language-Team: Estonian \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-06 11:36+0000\n" +"X-Launchpad-Export-Date: 2009-09-12 16:06+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:193 +#: ../core/src/org/openstreetmap/josm/Main.java:194 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 msgid "Creating main GUI" @@ -25,5 +25,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:203 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 @@ -32,18 +32,20 @@ msgstr "Abi" -#: ../core/src/org/openstreetmap/josm/Main.java:296 +#: ../core/src/org/openstreetmap/josm/Main.java:297 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "Projektsiooni {0} ei saa aktiveerida. Kasutan Mercatori" -#: ../core/src/org/openstreetmap/josm/Main.java:297 -#: ../core/src/org/openstreetmap/josm/Main.java:510 -#: ../core/src/org/openstreetmap/josm/Main.java:534 +#: ../core/src/org/openstreetmap/josm/Main.java:298 +#: ../core/src/org/openstreetmap/josm/Main.java:511 +#: ../core/src/org/openstreetmap/josm/Main.java:519 +#: ../core/src/org/openstreetmap/josm/Main.java:543 +#: ../core/src/org/openstreetmap/josm/Main.java:551 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -59,8 +61,8 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 @@ -74,6 +76,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -83,5 +85,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358 @@ -101,54 +103,51 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:289 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:218 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422 msgid "Error" msgstr "Viga" -#: ../core/src/org/openstreetmap/josm/Main.java:445 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/Main.java:446 +#, 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] "On salvestamata muudatusi. Tühista muudatused ja jätka?" -msgstr[1] "On salvestamata muudatusi. Tühista muudatused ja jätka?" - -#: ../core/src/org/openstreetmap/josm/Main.java:452 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/Main.java:453 msgid "Unsaved Changes" msgstr "Salvestamata muudatused" -#: ../core/src/org/openstreetmap/josm/Main.java:453 +#: ../core/src/org/openstreetmap/josm/Main.java:454 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 msgid "Save and Exit" msgstr "Salvesta ja välju" -#: ../core/src/org/openstreetmap/josm/Main.java:453 +#: ../core/src/org/openstreetmap/josm/Main.java:454 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 msgid "Discard and Exit" msgstr "Tühista ja välju" -#: ../core/src/org/openstreetmap/josm/Main.java:453 +#: ../core/src/org/openstreetmap/josm/Main.java:454 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 @@ -157,11 +156,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 @@ -175,20 +175,20 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Cancel" msgstr "Loobu" -#: ../core/src/org/openstreetmap/josm/Main.java:477 +#: ../core/src/org/openstreetmap/josm/Main.java:478 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoreerin vigast URL''i: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:478 -#: ../core/src/org/openstreetmap/josm/Main.java:497 +#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -205,16 +205,16 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 @@ -244,12 +244,14 @@ msgstr "Hoiatus" -#: ../core/src/org/openstreetmap/josm/Main.java:496 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoreerin vigast faili URL''i: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:533 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:92 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/Main.java:518 +#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:550 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93 #, java-format msgid "Could not read file ''{0}''.
Error is:
{1}" @@ -339,5 +341,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224 msgid "Plugins" msgstr "Pistikrakendused" @@ -468,9 +470,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -504,6 +506,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -522,11 +524,11 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:334 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121 msgid "Information" msgstr "Info" @@ -548,5 +550,5 @@ msgstr "Palun vali vähemalt kolm sõlme." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 #, java-format msgid "" @@ -555,10 +557,10 @@ msgstr "Muutuste arv ületab maksimaalse. Muutusi {0}, maksimaalselt {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:56 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:108 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105 msgid "API Capabilities Violation" msgstr "API võimaluste rikkumine" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76 #, java-format msgid "" @@ -567,5 +569,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 #, java-format msgid "" @@ -574,9 +576,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88 msgid "Precondition Violation" msgstr "Eeltingimuste rikkumine" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:103 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" @@ -631,26 +633,22 @@ msgstr "Ei ole vastuolusid, millele suumida" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine Way" msgstr "Sobita tee" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 msgid "Combine several ways into one." msgstr "Sobita mitu teed üheks." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -msgid "Please select at least two ways to combine." -msgstr "Palun vali vähemalt kaks teed, mida sobitada." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 msgid "Combine ways with different memberships?" msgstr "Sobita erinevate kuuluvustega teed?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 msgid "Combine Anyway" msgstr "Sobita ikkagi." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -659,13 +657,13 @@ "Valitud teedel on erinevad kuuluvusseosed. Kas Sa oled sobitamises kindel?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Change directions?" msgstr "Muuda suundi?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 msgid "Reverse and Combine" msgstr "Pööra ja sobita." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -675,30 +673,18 @@ "pöörata?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:214 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 -msgid "Enter values for all conflicts." -msgstr "Sisesta kõigi vastuolude kohta väärtused." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206 -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 -msgid "Solve Conflicts" -msgstr "Lahenda vastuolud." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 -#, java-format -msgid "Combine {0} ways" -msgstr "Ühenda {0} teed." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 -msgid "All the ways were empty" -msgstr "Kõik teed olid tühjad." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 msgid "" "Could not combine ways (They could not be merged into a single string of " "nodes)" msgstr "Ei saa teid ühendada. Ei saa liita üheks sõlmejadaks." + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#, java-format +msgid "Combine {0} ways" +msgstr "Ühenda {0} teed." + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +msgid "Please select at least two ways to combine." +msgstr "Palun vali vähemalt kaks teed, mida sobitada." #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -752,5 +738,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97 msgid "Delete" msgstr "Kustuta" @@ -760,15 +746,15 @@ msgstr "Kustuta valitud objektid." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Ülekirjutamine" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 msgid "File exists. Overwrite?" msgstr "Fail eksisteerib! Kas kirjutada see üle?" @@ -797,10 +783,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 #, java-format msgid "File: {0}" @@ -831,5 +817,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format @@ -872,7 +858,6 @@ #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202 -#, fuzzy msgid "All Formats" -msgstr "Eraldised" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 @@ -1007,1040 +992,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 msgid "Merge Nodes" msgstr "Liida sõlmed." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40 msgid "Merge nodes into the oldest one." msgstr "Liida sõlmed vanimaks." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52 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:158 -msgid "Merge nodes with different memberships?" -msgstr "Liida erineva kuuluvusega sõlmed?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 -msgid "Merge Anyway" -msgstr "Liida igal juhul." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 -msgid "" -"The selected nodes have differing relation memberships. Do you still want " -"to merge them?" -msgstr "Valitud sõlmedel on erinevad seosed. Liida need ikkagi?" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258 -msgid "Cannot merge nodes: Would have to delete a way that is still used." -msgstr "Ei saa sõlmi liita: tuleb kustutada tee, mis on endiselt kasutusel." - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301 -#, java-format -msgid "Merge {0} nodes" -msgstr "Sulanda {0} sõlm(e)" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 -msgid "Merge selection" -msgstr "Ühenda valik" - -#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 -msgid "Merge the currently selected primitives into another layer" -msgstr "Ühenda valitud primitiivid teise kihti" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75 -msgid "Mirror" -msgstr "Peegelda" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 -msgid "Mirror selected nodes and ways." -msgstr "Peegelda valitud sõlmed ja teed." - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 -msgid "Please select at least one node or way." -msgstr "Palun vali vähemalt üks sõlm või tee." - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 -msgid "up" -msgstr "Üles" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 -#, java-format -msgid "Move objects {0}" -msgstr "Liiguta objektid {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "Alla" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "Vasakule" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 -msgid "right" -msgstr "Paremale" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 -#, java-format -msgid "Move {0}" -msgstr "Liiguta {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 -#, java-format -msgid "Moves Objects {0}" -msgstr "Liiguta objektid {0}" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -msgid "Cannot move objects outside of the world." -msgstr "Objekte ei saa maailmast välja viia" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337 -msgid "New" -msgstr "Uus" - -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 -msgid "Create a new map." -msgstr "Loo uus kaart." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 -msgid "Open..." -msgstr "Ava..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35 -msgid "Open a file." -msgstr "Faili avamine." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65 -#, fuzzy -msgid "Opening files" -msgstr "Faili avamine." - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84 -#, java-format -msgid "Opening file ''{0}'' ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 -msgid "Open Location..." -msgstr "Ava asukoht..." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 -msgid "Open an URL." -msgstr "Ava URL" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 -msgid "Separate Layer" -msgstr "Eralda kiht." - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 -msgid "Enter URL to download:" -msgstr "Sisesta URL kust alla laadida:" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 -msgid "Download Location" -msgstr "Allalaadimise asukoht" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -msgid "Download URL" -msgstr "Allalaadimise URL" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 -msgid "Orthogonalize Shape" -msgstr "Muuda kujund ortogonaalseks." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Move nodes so all angles are 90 or 270 degree" -msgstr "Liiguta kõik sõlmed 90 või 270 kraadise nurga alla." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 -msgid "Only two nodes allowed" -msgstr "Ainult kaks sõlme lubatud." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 -msgid "Selection must consist only of ways." -msgstr "Valik peab koosnema ainult kahest sõlmest." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 -msgid "Please select one or more closed ways of at least four nodes." -msgstr "Palun vali üks või rohkem suletud, vähemalt nelja sõlmega teed." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122 -msgid "" -"You are using the EPSG:4326 projection which might lead
to " -"undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 -msgid "Only one node selected" -msgstr "Ainult üks sõlm valitud." - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 -msgid "Orthogonalize" -msgstr "Ristkülikusta." - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:113 -msgid "Paste" -msgstr "Kleebi" - -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -msgid "Paste contents of paste buffer." -msgstr "Kleebi puhvri sisu." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 -msgid "Paste Tags" -msgstr "Kleebi sildid." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Lisa kõikidele valitud objektidele puhvris olevad sildid." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116 -#, java-format -msgid "Pasting {0} tag" -msgid_plural "Pasting {0} tags" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117 -#, fuzzy, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "Primitiivi uuendamine" -msgstr[1] "Primitiivi uuendamine" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Preferences..." -msgstr "Eelistused..." - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 -msgid "Open a preferences page for global settings." -msgstr "Ava eelistuse leht, et muuta globaalseid sätteid" - -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 -msgid "Preferences" -msgstr "Eelistused" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -msgid "Redo" -msgstr "Uuesti" - -#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Tee uuesti viimane tagasivõtmine" - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 -msgid "Rename layer" -msgstr "Nimeta kiht ümber." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 -msgid "Also rename the file" -msgstr "Nimeta fail ka ümber." - -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 -#, java-format -msgid "Could not rename file ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -msgid "Reverse Ways" -msgstr "Pööra tee suund." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 -msgid "Reverse the direction of all selected ways." -msgstr "Pööra kõigi valitud teede suund." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 -msgid "Please select at least one way." -msgstr "Palun vali vähemalt üks tee." - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 -msgid "Reverse ways" -msgstr "Pööra teede suund." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 -msgid "Save" -msgstr "Salvesta" - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 -msgid "Save the current data." -msgstr "Salvesta praegused andmed" - -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#, java-format -msgid "File {0} exists. Overwrite?" -msgstr "Fail {0} on juba olemas. Kas kirjutan üle?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 -msgid "No Exporter found! Nothing saved." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Empty document" -msgstr "Tühi dokument" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "The document contains no data." -msgstr "Dokumendis ei ole andmeid." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93 -msgid "Save anyway" -msgstr "Salvesta ikkagi." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 -msgid "Conflicts" -msgstr "Konfliktid" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -msgid "" -"There are unresolved conflicts. Conflicts will not be saved and handled as " -"if you rejected all. Continue?" -msgstr "" -"On lahendamata vastuolusid. Vastuolusid ei lahendata, kui Sa lükkad kõik " -"tagasi. Jätkame?" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103 -msgid "Reject Conflicts and Save" -msgstr "Lahenda vastuolud ja salvesta." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 -msgid "Save OSM file" -msgstr "Salvesta OSM fail." - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 -msgid "Save GPX file" -msgstr "Salvesta GPX fail" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 -msgid "Save Layer" -msgstr "Salvesta kiht" - -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 -msgid "Save As..." -msgstr "Salvesta nimega..." - -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 -msgid "Save the current data to a new file." -msgstr "Salvesta need andmed uude faili." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -msgid "Select All" -msgstr "Vali kõik." - -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 -msgid "" -"Select all undeleted objects in the data layer. This selects incomplete " -"objects too." -msgstr "" -"Vali kõik kustutamata objektid sellel kihil. Poolikud objektid valitakse ka." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 -msgid "Show Status Report" -msgstr "Näita staatust" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -msgid "Show status report with useful information that can be attached to bugs" -msgstr "Näita kasuliku infoga staatust, mis ei ole seotud programmivigadega." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 -#, java-format -msgid "Help: {0}" -msgstr "Abi: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 -msgid "Status Report" -msgstr "Staatus" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -msgid "Copy to clipboard and close" -msgstr "Kopeeri puhvrisse ja sulge." - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:245 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -msgid "Close" -msgstr "Sulge" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 -msgid "Split Way" -msgstr "Lahuta tee." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 -msgid "Split a way at the selected node." -msgstr "Lahuta tee valitud sõlme kohalt." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 -msgid "The current selection cannot be used for splitting." -msgstr "Valik ei ole lahutamiseks sobiv." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 -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] "Valitud sõlm ei ole tee keskel." -msgstr[1] "Valitud sõlmed ei ole tee keskel." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 -msgid "" -"There is more than one way using the node you selected. Please select the " -"way also." -msgid_plural "" -"There is more than one way using the nodes you selected. Please select the " -"way also." -msgstr[0] "" -"On rohkem, kui üks viis valitud sõlme kasutamiseks. Vali ka tee, millesse " -"sõlm kuulub" -msgstr[1] "" -"On rohkem, kui üks viis valitud sõlmede kasutamiseks. Vali ka tee, millesse " -"sõlmed kuuluvad" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 -msgid "The selected nodes do not share the same way." -msgstr "Valitud sõlmed ei ole samast teest." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165 -msgid "The selected way does not contain the selected node." -msgid_plural "The selected way does not contain all the selected nodes." -msgstr[0] "Valitud tee ei sisalda valitud sõlme" -msgstr[1] "Valitud tee ei sisalda valitud sõlmi" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251 -msgid "You must select two or more nodes to split a circular way." -msgstr "Sa pead valima kaks või rohkem sõlme, et ringikujulist teed poolitada" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257 -msgid "" -"The way cannot be split at the selected nodes. (Hint: Select nodes in the " -"middle of the way.)" -msgstr "" -"The way cannot be split at the selected nodes. (Hint: Select nodes in the " -"middle of the way.)" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345 -msgid "" -"A role based relation membership was copied to all new ways.
You " -"should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 -msgid "" -"A relation membership was copied to all new ways.
You should verify " -"this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 -#, java-format -msgid "Split way {0} into {1} parts" -msgstr "Lõika tee {0} {1} osaks" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 -#, fuzzy -msgid "Close current changeset" -msgstr "Sulgen muutustekogumit..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 -#, fuzzy -msgid "Close the current changeset ..." -msgstr "Sulgen muutustekogumit..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 -msgid "There is currently no changeset open." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 -#, fuzzy -msgid "No open changeset" -msgstr "Avan muutustekogumit..." - -#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 -#, fuzzy -msgid "Closing changeset" -msgstr "Sulgen muutustekogumit..." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 -msgid "Toggle GPX Lines" -msgstr "Näita/peida GPX jooned." - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -msgid "Draw lines between raw gps points." -msgstr "Joonista joon gps punktide vahel" - -#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 -#, java-format -msgid "Toggles the global setting ''{0}''." -msgstr "Näita/peida seade {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -msgid "UnGlue Ways" -msgstr "Kleebi tee uuesti kokku." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 -msgid "Duplicate nodes that are used by multiple ways." -msgstr "Kahekordista sõlmed, mis on mitme tee poolt kasutatud." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 -msgid "This node is not glued to anything else." -msgstr "See on üksik sõlm." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 -msgid "None of these nodes are glued to anything else." -msgstr "Ükski neist sõlmedest ei ole millegi küljes." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 -msgid "None of this way's nodes are glued to anything else." -msgstr "Ükski selle tee sõlmedest ei ole millegi muu küljes." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 -msgid "The current selection cannot be used for unglueing." -msgstr "Seda valikut ei ole võimalik uuestiliitmiseks kasutada." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 -msgid "Select either:" -msgstr "Vali miski:" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 -msgid "* One tagged node, or" -msgstr "* üks sildiga sõlm või" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 -msgid "* One node that is used by more than one way, or" -msgstr "* üks sõlm, mis on kasutusel rohkem kui ühes tees või" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 -msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "" -"* üks sõlm, mis on kasutusel rohkem kui ühes tees ja ühes neist teedest" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 -msgid "" -"* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* üks sõlm, mis on kasutusel rohkem kui ühes tees ja rohkem kui ühes neist " -"teedest" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 -msgid "" -"* One way and one or more of its nodes that are used by more than one way." -msgstr "" -"* üks tee ja üks sõlm, mis on kasutusel rohkem kui ühes tees ja rohkem kui " -"ühes neist teedest" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127 -msgid "" -"Note: If a way is selected, this way will get fresh copies of the unglued\n" -"nodes and the new nodes will be selected. Otherwise, all ways will get " -"their\n" -"own copy and all nodes will be selected." -msgstr "" -"Märkus: Kui valitud on tee, saab see tee uued koopiad ühendamata sõlmedest\n" -" ja uued sõlmed valitakse.\n" -"Muul juhul saavad kõik teed omad koopiad ja kõik sõlmed valitakse." - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 -msgid "Unglued Node" -msgstr "Lahtisulatatud sõlm" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387 -#, java-format -msgid "Dupe into {0} nodes" -msgstr "Kordista {0} sõlmeks" - -#. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411 -#, java-format -msgid "Dupe {0} nodes into {1} nodes" -msgstr "Kordista {0} sõlme {1} sõlmeks" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -msgid "Undo" -msgstr "Võta tagasi" - -#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 -msgid "Undo the last action." -msgstr "Tühista eelmine tegevus" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 -msgid "Unselect All" -msgstr "Tühista kõik valikud" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -msgid "Unselect all objects." -msgstr "Tühista kõigi objektide valikud" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 -msgid "Unselect All (Focus)" -msgstr "Tühista kõik valikud (fookus)" - -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 -msgid "Unselect All (Escape)" -msgstr "Tühista kõik valikud (page)" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 -msgid "Update Data" -msgstr "Uuenda andmed" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -msgid "Updates the current data layer from the server (re-downloads data)" -msgstr "Uuendab praeguse andmekihi serverist (laadib uuesti)." - -#. bounds defined? => use the bbox downloader -#. -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77 -msgid "Updating data" -msgstr "Andmete värskendamine" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "No current dataset found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 -msgid "Didn't find a primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 -msgid "Update Selection" -msgstr "Uuenda valik" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90 -msgid "Updates the currently selected primitives from the server" -msgstr "Värskendab valitud primitiivid serverist" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119 -msgid "There are no selected primitives to update." -msgstr "Ei ole valitud primitiive mida uuendada." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 -msgid "Selection empty" -msgstr "Tühi valik" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103 -msgid "Upload to OSM..." -msgstr "Lae OSMi serverisse" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102 -msgid "Upload all changes to the OSM server." -msgstr "Lae kõik muudatused OSM serverisse üles." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135 -#, fuzzy, java-format -msgid "" -"There are unresolved conflicts in layer ''{0}''.
You have to " -"resolve them first." -msgstr "Lahendamata konfliktid! Sa pead need enne lahendama." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -msgid "Nothing to upload. Get some data first." -msgstr "Midagi pole üles laadida. Hangi esmalt andmeid." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 -msgid "No changes to upload." -msgstr "Pole muudatusi mida üles laadida." - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#, java-format -msgid "Synchronize {0} {1} only" -msgstr "Sünkroniseeri ainult {0} {1}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 -msgid "Synchronize entire dataset" -msgstr "Sünkroniseeri kogu andmekogu" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 -#, java-format -msgid "" -"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.
" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280 -msgid "Conflict detected" -msgstr "Avastatud konflikt" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293 -#, java-format -msgid "unexpected return value. Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#, 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:309 -#, java-format -msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405 -msgid "Upload to OSM API failed" -msgstr "Laadimine OSM API-le ebaõnnestus" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427 -msgid "Updating primitive" -msgstr "Primitiivi uuendamine" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474 -msgid "Upload these changes?" -msgstr "Kas laen need muudatused üles?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475 -msgid "Upload Changes" -msgstr "Lae muudatused üles" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527 -#, java-format -msgid "Uploading data for layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:651 -msgid "Use a new changeset and close it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:652 -msgid "" -"Select to upload the data using a new changeset and to close the changeset " -"after the upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:655 -msgid "Use a new changeset and leave it open" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 -msgid "" -"Select to upload the data using a new changeset and to leave the changeset " -"open after the upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:658 -#, fuzzy -msgid "Upload to a new or to an existing changeset?" -msgstr "Ühenda uus sõlm olemasoleva teega" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680 -msgid "upload all changes in one request" -msgstr "lae kõik muudatused ühe päringuga" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681 -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/actions/UploadAction.java:698 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Esitada lühike kommentaar üleslaetavatele muutustele:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:731 -#, fuzzy -msgid "Settings" -msgstr "Kaardi seaded" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936 -msgid "Tags of new changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755 -msgid "Objects to add:" -msgstr "Objektid lisada:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761 -msgid "Objects to modify:" -msgstr "Objektid muuta:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767 -msgid "Objects to delete:" -msgstr "Objektid kustutada:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:803 -#, fuzzy, java-format -msgid "{0} object to add:" -msgid_plural "{0} objects to add:" -msgstr[0] "Objektid lisada:" -msgstr[1] "Objektid lisada:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:812 -#, fuzzy, java-format -msgid "{0} object to modifiy:" -msgid_plural "{0} objects to modify:" -msgstr[0] "Objektid muuta:" -msgstr[1] "Objektid muuta:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:821 -#, fuzzy, java-format -msgid "{0} object to delete:" -msgid_plural "{0} objects to delete:" -msgstr[0] "Objektid kustutada:" -msgstr[1] "Objektid kustutada:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:910 -#, java-format -msgid "Use the existing changeset {0} and close it after upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:911 -#, java-format -msgid "" -"Select to upload to the existing changeset {0} and to close the changeset " -"after this upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:914 -#, java-format -msgid "Use the existing changeset {0} and leave it open" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:915 -#, java-format -msgid "" -"Select to upload to the existing changeset {0} and to leave the changeset " -"open for further uploads" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:942 -#, fuzzy, java-format -msgid "Tags of changeset {0}" -msgstr "Viimane muudatus {0}" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 -msgid "Zoom In" -msgstr "Suumi sisse" - -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 -msgid "Zoom Out" -msgstr "Suumi välja" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -msgid "Back" -msgstr "Tagasi" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 -msgid "Jump back." -msgstr "Hüppa tagasi" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -#, java-format -msgid "Audio: {0}" -msgstr "Audio: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 -msgid "Faster" -msgstr "Kiiremini" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 -msgid "Faster Forward" -msgstr "Kiiremini edasi" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 -msgid "Forward" -msgstr "Edasi" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 -msgid "Jump forward" -msgstr "Hüppa edasi" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 -msgid "Next Marker" -msgstr "Järgmine järjehoidja" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 -msgid "Play next marker." -msgstr "Mängi järgmine järjehoidja" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 -msgid "Play/Pause" -msgstr "Esita /paus" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 -msgid "Play/pause audio." -msgstr "Esita/pausi heli" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 -msgid "Previous Marker" -msgstr "Eelmine järjehoidja" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 -msgid "Play previous marker." -msgstr "Mängi eelmine järjehoidja" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 -msgid "Slower" -msgstr "Aeglasemalt" - -#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 -msgid "Slower Forward" -msgstr "Aeglasemalt edasi" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 -msgid "Downloading GPS data" -msgstr "GPS andmete allalaadimine" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 -msgid "Downloaded GPX Data" -msgstr "Alla laetud GPX andmed" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 -msgid "Raw GPS data" -msgstr "Toored GPS andmed" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 -msgid "Downloading data" -msgstr "Andmete allalaadimine" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 -#, java-format -msgid "" -"Ignoring exception because download has been cancelled. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119 -msgid "No data imported." -msgstr "Andmeid ei imporditud." - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150 -msgid "OpenStreetMap data" -msgstr "Openstreetmapi andmed" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 -#, java-format -msgid "Download {0} of {1} ({2} left)" -msgstr "Laen alla {0} {1}-st ({2} veel)" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108 -#, java-format -msgid "The following errors occurred during mass download:{0}" -msgstr "Mass-allalaadimise käigus tekkisid järgmised vead:{0}" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110 -msgid "Errors during Download" -msgstr "Viga allaladimise ajal" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175 -#, java-format -msgid "" -"There are {0} primitives in your local dataset which
might be " -"deleted on the server. If you later try to delete or
update them 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 "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191 -msgid "Deleted or moved primitives" -msgstr "Kustutatud või nihutatud primitiivid" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 -msgid "Delete Mode" -msgstr "Kustutusrežiim" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 -msgid "Delete nodes or ways." -msgstr "Kustuta sõlmi või teid" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 -#, java-format -msgid "Mode: {0}" -msgstr "Režiim: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270 -msgid "" -"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " -"when deleting a way. Ctrl: delete referring objects." -msgstr "" - +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 +#: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 @@ -2051,7 +1021,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:51 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:249 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:287 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284 @@ -2060,6 +1031,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 -#: ../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/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 @@ -2090,4 +1061,884 @@ msgstr "parameeter ''{0}'' ei tohi olla null" +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223 +msgid "Cannot merge nodes: Would have to delete a way that is still used." +msgstr "Ei saa sõlmi liita: tuleb kustutada tee, mis on endiselt kasutusel." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248 +#, java-format +msgid "Merge {0} nodes" +msgstr "Sulanda {0} sõlm(e)" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge selection" +msgstr "Ühenda valik" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 +msgid "Merge the currently selected primitives into another layer" +msgstr "Ühenda valitud primitiivid teise kihti" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75 +msgid "Mirror" +msgstr "Peegelda" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 +msgid "Mirror selected nodes and ways." +msgstr "Peegelda valitud sõlmed ja teed." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgid "Please select at least one node or way." +msgstr "Palun vali vähemalt üks sõlm või tee." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgid "up" +msgstr "Üles" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#, java-format +msgid "Move objects {0}" +msgstr "Liiguta objektid {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +msgid "down" +msgstr "Alla" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgid "left" +msgstr "Vasakule" + +#. dir == Direction.RIGHT) { +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +msgid "right" +msgstr "Paremale" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#, java-format +msgid "Move {0}" +msgstr "Liiguta {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#, java-format +msgid "Moves Objects {0}" +msgstr "Liiguta objektid {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +msgid "Cannot move objects outside of the world." +msgstr "Objekte ei saa maailmast välja viia" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337 +msgid "New" +msgstr "Uus" + +#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 +msgid "Create a new map." +msgstr "Loo uus kaart." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37 +msgid "Open..." +msgstr "Ava..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36 +msgid "Open a file." +msgstr "Faili avamine." + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66 +msgid "Opening files" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85 +#, java-format +msgid "Opening file ''{0}'' ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 +msgid "Open Location..." +msgstr "Ava asukoht..." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 +msgid "Open an URL." +msgstr "Ava URL" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38 +msgid "Separate Layer" +msgstr "Eralda kiht." + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 +msgid "Enter URL to download:" +msgstr "Sisesta URL kust alla laadida:" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 +msgid "Download Location" +msgstr "Allalaadimise asukoht" + +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47 +msgid "Download URL" +msgstr "Allalaadimise URL" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "Muuda kujund ortogonaalseks." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +msgid "Move nodes so all angles are 90 or 270 degree" +msgstr "Liiguta kõik sõlmed 90 või 270 kraadise nurga alla." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +msgid "Only two nodes allowed" +msgstr "Ainult kaks sõlme lubatud." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +msgid "Selection must consist only of ways." +msgstr "Valik peab koosnema ainult kahest sõlmest." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +msgid "Please select one or more closed ways of at least four nodes." +msgstr "Palun vali üks või rohkem suletud, vähemalt nelja sõlmega teed." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122 +msgid "" +"You are using the EPSG:4326 projection which might lead
to " +"undesirable results when doing rectangular alignments.
Change your " +"projection to get rid of this warning.
Do you want to continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140 +msgid "Only one node selected" +msgstr "Ainult üks sõlm valitud." + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321 +msgid "Orthogonalize" +msgstr "Ristkülikusta." + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112 +msgid "Paste" +msgstr "Kleebi" + +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +msgid "Paste contents of paste buffer." +msgstr "Kleebi puhvri sisu." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "Kleebi sildid." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +msgid "Apply tags of contents of paste buffer to all selected items." +msgstr "Lisa kõikidele valitud objektidele puhvris olevad sildid." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#, java-format +msgid "Pasting {0} tag" +msgid_plural "Pasting {0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#, java-format +msgid "to {0} primitive" +msgid_plural "to {0} primtives" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Preferences..." +msgstr "Eelistused..." + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 +msgid "Open a preferences page for global settings." +msgstr "Ava eelistuse leht, et muuta globaalseid sätteid" + +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49 +msgid "Preferences" +msgstr "Eelistused" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 +msgid "Redo" +msgstr "Uuesti" + +#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Tee uuesti viimane tagasivõtmine" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64 +msgid "Rename layer" +msgstr "Nimeta kiht ümber." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +msgid "Also rename the file" +msgstr "Nimeta fail ka ümber." + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92 +#, java-format +msgid "Could not rename file ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 +msgid "Reverse Ways" +msgstr "Pööra tee suund." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 +msgid "Reverse the direction of all selected ways." +msgstr "Pööra kõigi valitud teede suund." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49 +msgid "Please select at least one way." +msgstr "Palun vali vähemalt üks tee." + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79 +msgid "Reverse ways" +msgstr "Pööra teede suund." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +msgid "Save" +msgstr "Salvesta" + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +msgid "Save the current data." +msgstr "Salvesta praegused andmed" + +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 +#, java-format +msgid "File {0} exists. Overwrite?" +msgstr "Fail {0} on juba olemas. Kas kirjutan üle?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 +msgid "No Exporter found! Nothing saved." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96 +msgid "Empty document" +msgstr "Tühi dokument" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 +msgid "Save anyway" +msgstr "Salvesta ikkagi." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99 +msgid "The document contains no data." +msgstr "Dokumendis ei ole andmeid." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +msgid "Conflicts" +msgstr "Konfliktid" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgid "Reject Conflicts and Save" +msgstr "Lahenda vastuolud ja salvesta." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +msgid "" +"There are unresolved conflicts. Conflicts will not be saved and handled as " +"if you rejected all. Continue?" +msgstr "" +"On lahendamata vastuolusid. Vastuolusid ei lahendata, kui Sa lükkad kõik " +"tagasi. Jätkame?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +msgid "Save OSM file" +msgstr "Salvesta OSM fail." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +msgid "Save GPX file" +msgstr "Salvesta GPX fail" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +msgid "Save Layer" +msgstr "Salvesta kiht" + +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +msgid "Save As..." +msgstr "Salvesta nimega..." + +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +msgid "Save the current data to a new file." +msgstr "Salvesta need andmed uude faili." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +msgid "Select All" +msgstr "Vali kõik." + +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 +msgid "" +"Select all undeleted objects in the data layer. This selects incomplete " +"objects too." +msgstr "" +"Vali kõik kustutamata objektid sellel kihil. Poolikud objektid valitakse ka." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +msgid "Show Status Report" +msgstr "Näita staatust" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +msgid "Show status report with useful information that can be attached to bugs" +msgstr "Näita kasuliku infoga staatust, mis ei ole seotud programmivigadega." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38 +#, java-format +msgid "Help: {0}" +msgstr "Abi: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 +msgid "Status Report" +msgstr "Staatus" + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +msgid "Copy to clipboard and close" +msgstr "Kopeeri puhvrisse ja sulge." + +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 +msgid "Close" +msgstr "Sulge" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 +msgid "Split Way" +msgstr "Lahuta tee." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 +msgid "Split a way at the selected node." +msgstr "Lahuta tee valitud sõlme kohalt." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 +msgid "The current selection cannot be used for splitting." +msgstr "Valik ei ole lahutamiseks sobiv." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125 +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] "Valitud sõlm ei ole tee keskel." +msgstr[1] "Valitud sõlmed ei ole tee keskel." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 +msgid "" +"There is more than one way using the node you selected. Please select the " +"way also." +msgid_plural "" +"There is more than one way using the nodes you selected. Please select the " +"way also." +msgstr[0] "" +"On rohkem, kui üks viis valitud sõlme kasutamiseks. Vali ka tee, millesse " +"sõlm kuulub" +msgstr[1] "" +"On rohkem, kui üks viis valitud sõlmede kasutamiseks. Vali ka tee, millesse " +"sõlmed kuuluvad" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 +msgid "The selected nodes do not share the same way." +msgstr "Valitud sõlmed ei ole samast teest." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165 +msgid "The selected way does not contain the selected node." +msgid_plural "The selected way does not contain all the selected nodes." +msgstr[0] "Valitud tee ei sisalda valitud sõlme" +msgstr[1] "Valitud tee ei sisalda valitud sõlmi" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251 +msgid "You must select two or more nodes to split a circular way." +msgstr "Sa pead valima kaks või rohkem sõlme, et ringikujulist teed poolitada" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257 +msgid "" +"The way cannot be split at the selected nodes. (Hint: Select nodes in the " +"middle of the way.)" +msgstr "" +"The way cannot be split at the selected nodes. (Hint: Select nodes in the " +"middle of the way.)" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345 +msgid "" +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +msgid "" +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#, java-format +msgid "Split way {0} into {1} parts" +msgstr "Lõika tee {0} {1} osaks" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24 +msgid "Close current changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29 +msgid "Close the current changeset ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41 +msgid "There is currently no changeset open." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42 +msgid "No open changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60 +msgid "Closing changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 +msgid "Toggle GPX Lines" +msgstr "Näita/peida GPX jooned." + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +msgid "Draw lines between raw gps points." +msgstr "Joonista joon gps punktide vahel" + +#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 +#, java-format +msgid "Toggles the global setting ''{0}''." +msgstr "Näita/peida seade {0}" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +msgid "UnGlue Ways" +msgstr "Kleebi tee uuesti kokku." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +msgid "Duplicate nodes that are used by multiple ways." +msgstr "Kahekordista sõlmed, mis on mitme tee poolt kasutatud." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +msgid "This node is not glued to anything else." +msgstr "See on üksik sõlm." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107 +msgid "None of these nodes are glued to anything else." +msgstr "Ükski neist sõlmedest ei ole millegi küljes." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109 +msgid "None of this way's nodes are glued to anything else." +msgstr "Ükski selle tee sõlmedest ei ole millegi muu küljes." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +msgid "The current selection cannot be used for unglueing." +msgstr "Seda valikut ei ole võimalik uuestiliitmiseks kasutada." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +msgid "Select either:" +msgstr "Vali miski:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +msgid "* One tagged node, or" +msgstr "* üks sildiga sõlm või" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +msgid "* One node that is used by more than one way, or" +msgstr "* üks sõlm, mis on kasutusel rohkem kui ühes tees või" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 +msgid "* One node that is used by more than one way and one of those ways, or" +msgstr "" +"* üks sõlm, mis on kasutusel rohkem kui ühes tees ja ühes neist teedest" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +msgid "" +"* One way that has one or more nodes that are used by more than one way, or" +msgstr "" +"* üks sõlm, mis on kasutusel rohkem kui ühes tees ja rohkem kui ühes neist " +"teedest" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 +msgid "" +"* One way and one or more of its nodes that are used by more than one way." +msgstr "" +"* üks tee ja üks sõlm, mis on kasutusel rohkem kui ühes tees ja rohkem kui " +"ühes neist teedest" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127 +msgid "" +"Note: If a way is selected, this way will get fresh copies of the unglued\n" +"nodes and the new nodes will be selected. Otherwise, all ways will get " +"their\n" +"own copy and all nodes will be selected." +msgstr "" +"Märkus: Kui valitud on tee, saab see tee uued koopiad ühendamata sõlmedest\n" +" ja uued sõlmed valitakse.\n" +"Muul juhul saavad kõik teed omad koopiad ja kõik sõlmed valitakse." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 +msgid "Unglued Node" +msgstr "Lahtisulatatud sõlm" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385 +#, java-format +msgid "Dupe into {0} nodes" +msgstr "Kordista {0} sõlmeks" + +#. only one changeCommand for a way, else garbage will happen +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409 +#, java-format +msgid "Dupe {0} nodes into {1} nodes" +msgstr "Kordista {0} sõlme {1} sõlmeks" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 +msgid "Undo" +msgstr "Võta tagasi" + +#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 +msgid "Undo the last action." +msgstr "Tühista eelmine tegevus" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 +msgid "Unselect All" +msgstr "Tühista kõik valikud" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 +msgid "Unselect all objects." +msgstr "Tühista kõigi objektide valikud" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +msgid "Unselect All (Focus)" +msgstr "Tühista kõik valikud (fookus)" + +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 +msgid "Unselect All (Escape)" +msgstr "Tühista kõik valikud (page)" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "Uuenda andmed" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 +msgid "Updates the current data layer from the server (re-downloads data)" +msgstr "Uuendab praeguse andmekihi serverist (laadib uuesti)." + +#. bounds defined? => use the bbox downloader +#. +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77 +msgid "Updating data" +msgstr "Andmete värskendamine" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +msgid "Didn't find a primitive with id {0} in the current dataset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgid "Update Selection" +msgstr "Uuenda valik" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +msgid "Updates the currently selected primitives from the server" +msgstr "Värskendab valitud primitiivid serverist" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 +msgid "There are no selected primitives to update." +msgstr "Ei ole valitud primitiive mida uuendada." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 +msgid "Selection empty" +msgstr "Tühi valik" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +msgid "Upload to OSM..." +msgstr "Lae OSMi serverisse" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +msgid "Upload all changes to the OSM server." +msgstr "Lae kõik muudatused OSM serverisse üles." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133 +#, java-format +msgid "" +"There are unresolved conflicts in layer ''{0}''.
You have to " +"resolve them first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +msgid "Nothing to upload. Get some data first." +msgstr "Midagi pole üles laadida. Hangi esmalt andmeid." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166 +msgid "No changes to upload." +msgstr "Pole muudatusi mida üles laadida." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218 +#, java-format +msgid "Synchronize {0} {1} only" +msgstr "Sünkroniseeri ainult {0} {1}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263 +msgid "Synchronize entire dataset" +msgstr "Sünkroniseeri kogu andmekogu" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 +#, java-format +msgid "" +"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.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278 +msgid "Conflict detected" +msgstr "Avastatud konflikt" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#, java-format +msgid "unexpected return value. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267 +#, 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:307 +#, java-format +msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403 +msgid "Upload to OSM API failed" +msgstr "Laadimine OSM API-le ebaõnnestus" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 +msgid "Updating primitive" +msgstr "Primitiivi uuendamine" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493 +#, java-format +msgid "Uploading data for layer ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 +msgid "Zoom In" +msgstr "Suumi sisse" + +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16 +msgid "Zoom Out" +msgstr "Suumi välja" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +msgid "Back" +msgstr "Tagasi" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18 +msgid "Jump back." +msgstr "Hüppa tagasi" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +#, java-format +msgid "Audio: {0}" +msgstr "Audio: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14 +msgid "Faster" +msgstr "Kiiremini" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13 +msgid "Faster Forward" +msgstr "Kiiremini edasi" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18 +msgid "Forward" +msgstr "Edasi" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17 +msgid "Jump forward" +msgstr "Hüppa edasi" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 +msgid "Next Marker" +msgstr "Järgmine järjehoidja" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 +msgid "Play next marker." +msgstr "Mängi järgmine järjehoidja" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19 +msgid "Play/Pause" +msgstr "Esita /paus" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 +msgid "Play/pause audio." +msgstr "Esita/pausi heli" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 +msgid "Previous Marker" +msgstr "Eelmine järjehoidja" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 +msgid "Play previous marker." +msgstr "Mängi eelmine järjehoidja" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14 +msgid "Slower" +msgstr "Aeglasemalt" + +#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13 +msgid "Slower Forward" +msgstr "Aeglasemalt edasi" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +msgid "Downloading GPS data" +msgstr "GPS andmete allalaadimine" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +msgid "Downloaded GPX Data" +msgstr "Alla laetud GPX andmed" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +msgid "Raw GPS data" +msgstr "Toored GPS andmed" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 +msgid "Downloading data" +msgstr "Andmete allalaadimine" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data imported." +msgstr "Andmeid ei imporditud." + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 +msgid "OpenStreetMap data" +msgstr "Openstreetmapi andmed" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59 +#, java-format +msgid "Download {0} of {1} ({2} left)" +msgstr "Laen alla {0} {1}-st ({2} veel)" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "Mass-allalaadimise käigus tekkisid järgmised vead:{0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113 +msgid "Errors during Download" +msgstr "Viga allaladimise ajal" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210 +#, java-format +msgid "" +"There are {0} primitives in your local dataset which
might be " +"deleted on the server. If you later try to delete or
update them 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 "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226 +msgid "Deleted or moved primitives" +msgstr "Kustutatud või nihutatud primitiivid" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 +msgid "Delete Mode" +msgstr "Kustutusrežiim" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 +msgid "Delete nodes or ways." +msgstr "Kustuta sõlmi või teid" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 +#, java-format +msgid "Mode: {0}" +msgstr "Režiim: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270 +msgid "" +"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " +"when deleting a way. Ctrl: delete referring objects." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 @@ -2201,18 +2052,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 msgid "Select" msgstr "Vali" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 msgid "Select, move and rotate objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213 #, java-format msgid "Add and move a virtual new node to way" @@ -2221,17 +2072,17 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 #, java-format msgid "" @@ -2241,5 +2092,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 msgid "Always move and don't show dialog again" msgstr "" @@ -2404,41 +2255,41 @@ msgstr "Otsi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Start Search" msgstr "Alusta otsingut" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #, java-format msgid "Found {0} matches" msgstr "Leitud {0} vastet" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242 msgid "RX" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33 #, java-format msgid "" @@ -2448,40 +2299,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174 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:215 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:527 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:537 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614 #, java-format msgid "" @@ -2490,5 +2341,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:608 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2525,7 +2376,7 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Add node {0}" -msgstr "Lisa punkt" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -2535,22 +2386,22 @@ #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 -#, fuzzy, java-format +#, java-format msgid "Add relation {0}" -msgstr "Seosed: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 -#, fuzzy, java-format +#, java-format msgid "Change node {0}" -msgstr "Muuda {0} objekt" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 -#, fuzzy, java-format +#, java-format msgid "Change way {0}" -msgstr "Viimane muudatus {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 -#, fuzzy, java-format +#, java-format msgid "Change relation {0}" -msgstr "Muuda seost" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 @@ -2650,30 +2501,30 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127 -#, fuzzy, java-format +#, java-format msgid "Delete {0} object" msgid_plural "Delete {0} objects" -msgstr[0] "Kustuta {0} {1}" -msgstr[1] "Kustuta {0} {1}" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 -#, fuzzy, java-format +#, java-format msgid "Delete {0} node" msgid_plural "Delete {0} nodes" -msgstr[0] "Kustutusrežiim" -msgstr[1] "Kustutusrežiim" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 -#, fuzzy, java-format +#, java-format msgid "Delete {0} way" msgid_plural "Delete {0} ways" -msgstr[0] "Kustuta {0} {1}" -msgstr[1] "Kustuta {0} {1}" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 -#, fuzzy, java-format +#, java-format msgid "Delete {0} relation" msgid_plural "Delete {0} relations" -msgstr[0] "{0} seos" -msgstr[1] "{0} seosed" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195 @@ -2707,5 +2558,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:141 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3018,5 +2869,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:44 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #, java-format @@ -3024,23 +2875,48 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323 #, java-format msgid "parameter {0} > 0 required. Got {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325 +#, fuzzy, java-format +msgid "paramete''{0}'' must not be null" +msgstr "parameeter ''{0}'' ei tohi olla null" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331 +#, fuzzy, java-format +msgid "unsupported value ''{0}'' or parameter ''{1}''" +msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Error: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 #, java-format msgid "Warning: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166 +#, java-format +msgid "expected id >= 0. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257 msgid "a primitive with id=0 can't be invisible" msgstr "" +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293 +#, java-format +msgid "id > 0 expected. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295 +#, java-format +msgid "version > 0 expected. Got {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26 #, java-format @@ -3053,11 +2929,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:571 -#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:605 -#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:623 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628 msgid "" "tag collection can't be applied to a primitive because there are keys with " "multiple values" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +msgid "can't add node {0} to incomplete way {1}" msgstr "" @@ -3108,9 +2989,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247 msgid "Area style way is not closed." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478 #, java-format msgid "multipolygon way ''{0}'' is not closed." @@ -3119,118 +3000,118 @@ #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed #. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:835 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851 msgid "Empty member in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:837 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:848 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:656 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:660 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:673 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:677 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327 msgid "untagged" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328 msgid "text" msgstr "" @@ -3253,5 +3134,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3262,5 +3143,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3271,5 +3152,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3378,5 +3259,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "railway" msgstr "" @@ -3408,127 +3289,33 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42 -#, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.
Check " -"the server URL in your preferences and your internet connection." -msgstr "" - -#. item "Ways/Cycleway" combo "Pedestrians" -#. item "Ways/Footway" combo "Bikes" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:58 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:228 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 -#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 -#: build/trans_presets.java:323 build/trans_presets.java:324 -#: build/trans_presets.java:325 build/trans_presets.java:326 -#: build/trans_presets.java:327 build/trans_presets.java:328 -#: build/trans_presets.java:329 build/trans_presets.java:330 -#: build/trans_presets.java:331 build/trans_presets.java:332 -#: build/trans_presets.java:333 build/trans_presets.java:449 -#: build/trans_presets.java:469 build/trans_presets.java:529 -#: build/trans_presets.java:530 build/trans_presets.java:531 -#: build/trans_presets.java:550 build/trans_presets.java:551 -#: build/trans_presets.java:552 build/trans_presets.java:571 -#: build/trans_presets.java:572 build/trans_presets.java:573 -#: build/trans_presets.java:592 build/trans_presets.java:593 -#: build/trans_presets.java:594 build/trans_presets.java:613 -#: build/trans_presets.java:614 build/trans_presets.java:615 -#: build/trans_presets.java:634 build/trans_presets.java:635 -#: build/trans_presets.java:636 build/trans_presets.java:773 -#: build/trans_presets.java:788 build/trans_presets.java:1330 -#: build/trans_presets.java:1397 build/trans_presets.java:1398 -#: build/trans_presets.java:1399 build/trans_presets.java:2439 -#: build/trans_presets.java:2440 build/trans_presets.java:2441 -msgid "unknown" -msgstr "tundmatu" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61 -#, 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." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 msgid "Precondition violation" msgstr "Eelitingimuste rikkumine" +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81 +msgid "Security exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107 +msgid "IO Exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120 +msgid "Internal Server Error" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 -#, java-format -msgid "" -"Failed to open a connection to the remote server
''{0}''
for " -"security reasons. This is most likely because you are running
in an " -"applet and because you didn''t load your applet from ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139 -msgid "Security exception" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154 -#, java-format -msgid "" -"Failed to open a connection to the remote server
''{0}''.
Please " -"check your internet connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 -msgid "Network exception" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179 -#, java-format -msgid "" -"Failed to upload data to or download data from
''{0}''
due to a " -"problem with transferring data.
Details(untranslated): {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189 -msgid "IO Exception" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:203 -#, java-format -msgid "" -"The OSM server
''{0}''
reported an internal server error." -"
This is most likely a temporary problem. Please try again later." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:213 -msgid "Internal Server Error" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:235 -#, java-format -msgid "" -"Failed to open a connection to the remote server
''{0}''.
Host " -"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " -"preferences and your internet connection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245 +msgid "Bad Request" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 msgid "Unknown host" msgstr "Tundmatu host" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 msgid "Primitive already deleted" msgstr "Primitiiv on juba kustutatud" @@ -3745,5 +3532,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 #, java-format msgid "Menu: {0}" @@ -4120,4 +3907,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 @@ -4189,8 +3978,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114 +#: ../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/tags/TagMergeItem.java:33 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52 @@ -4313,5 +4102,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 msgid "deleted" msgstr "" @@ -4371,5 +4160,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:197 msgid "No, abort" msgstr "" @@ -4411,4 +4200,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 @@ -4422,5 +4212,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120 msgid "merged nodes not frozen yet. Can't build resolution command" msgstr "" @@ -4526,4 +4316,40 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +msgid "Conflicts when combining primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#, java-format +msgid "Conflicts when combining ways - combined way is ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#, java-format +msgid "Conflicts when merging nodes - merged node is ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236 +#, fuzzy +msgid "No conflicts to resolve" +msgstr "Ei ole vastuolusid, millele suumida" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 +msgid "Cancel conflict resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 +msgid "Apply resolved conflicts" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 +msgid "Apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4536,24 +4362,23 @@ msgstr "kõik" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 msgid "Choose a value" -msgstr "Vali värv" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:43 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 msgid "Please decided which values to keep" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 #, java-format msgid "The key ''{0}'' and all it's values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:56 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4561,7 +4386,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53 -#, fuzzy, java-format +#, java-format msgid "parameter ''{0}'' must not be empty" -msgstr "parameeter ''{0}'' ei tohi olla null" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 @@ -4574,14 +4399,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 msgid "not yet decided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:289 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63 msgid "Not decided yet" -msgstr "Pole veel teostatud." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 @@ -4590,17 +4416,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 -#, fuzzy msgid "Tags from ways" -msgstr "teelt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 -#, fuzzy msgid "Tags from relations" -msgstr "Muuda seost" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 -#, fuzzy msgid "Conflicts in pasted tags" -msgstr "Konfliktid andmetes" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151 @@ -4624,24 +4447,8 @@ msgstr[1] "{0} seosed" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257 -#, fuzzy -msgid "Cancel conflict resolution" -msgstr "Konfliktne relatsioon" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272 -#, fuzzy -msgid "Apply resolved conflicts" -msgstr "Lahenda vastuolud." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 -msgid "Apply" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380 -#, fuzzy msgid "Paste ..." -msgstr "Kleebi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365 @@ -4656,9 +4463,74 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428 -#, fuzzy, java-format +#, java-format msgid "{0} tag" msgid_plural "{0} tags" -msgstr[0] "{0} tee" -msgstr[1] "{0} teed" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 +#, java-format +msgid "pos {0} is out of range. current number of members: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53 +#, fuzzy +msgid "Remove this relation member from the relation" +msgstr "Eemalda hetkel valitud tabelirea liige sellest seosest" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57 +#, fuzzy +msgid "Replace" +msgstr "koht" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58 +msgid "Replace the way this member refers to with the combined way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62 +msgid "Undecided" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65 +msgid "Tag modified relations with " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 +msgid "Key:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 +#, fuzzy +msgid "Value:" +msgstr "Väärtus" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86 +msgid "Apply this role to all members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 +msgid "Pos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51 +#, fuzzy +msgid "Orig. Way" +msgstr "Ühesuunaline" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 +#, fuzzy +msgid "Decision" +msgstr "Revisjon" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4685,5 +4557,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:83 #, java-format msgid "Toggle: {0}" @@ -4714,5 +4586,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 msgid "" "Set the selected elements on the map to the selected items in the list above." @@ -4786,13 +4658,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 -#, fuzzy, java-format +#, java-format msgid "Way {0}" -msgstr "Kaart: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 -#, fuzzy, java-format +#, java-format msgid "Relation {0}" -msgstr "Seosed: {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -4878,5 +4750,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:112 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106 msgid "" msgstr "" @@ -4935,5 +4807,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:65 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75 msgid "Add" msgstr "Lisa" @@ -4983,5 +4855,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146 -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3109 msgid "Relations" msgstr "Seosed" @@ -5075,9 +4947,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133 -#, fuzzy, java-format +#, java-format msgid "{0} Author" msgid_plural "{0} Authors" -msgstr[0] "Autor" -msgstr[1] "Autor" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 @@ -5090,7 +4962,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 -#, fuzzy msgid "Launches a browser with information about the user" -msgstr "Rohkem teavet sellest funktsioonist" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 @@ -5171,5 +5042,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" @@ -5187,9 +5058,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166 msgid "Child Relations" -msgstr "" - -#. --- role editing -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581 -msgid "Role:" msgstr "" @@ -5440,11 +5306,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 msgid "Download referring relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81 -#, java-format -msgid "child.id >0 expected. Got {1}" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.getId() >0 expected. Got {1}" msgstr "" @@ -5458,7 +5324,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 -#, fuzzy msgid "Loading parent relations" -msgstr "Pistikrakenduste laadimine" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5582,5 +5447,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2747 msgid "Places" msgstr "Asukohad" @@ -5661,5 +5526,5 @@ "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " "Hold right mousebutton and move mouse or use cursor keys. Select: " -"Click." +"Hold left mousebutton and draw a frame." msgstr "" @@ -5709,7 +5574,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#, fuzzy msgid "Reload the history from the server" -msgstr "Lae käesolikud valikud serverisse" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -6592,52 +6456,52 @@ #: build/trans_presets.java:2332 build/trans_presets.java:2338 #: build/trans_presets.java:2344 build/trans_presets.java:2354 -#: build/trans_presets.java:2448 build/trans_presets.java:2455 -#: build/trans_presets.java:2469 build/trans_presets.java:2475 -#: build/trans_presets.java:2482 build/trans_presets.java:2489 -#: build/trans_presets.java:2495 build/trans_presets.java:2501 -#: build/trans_presets.java:2523 build/trans_presets.java:2530 -#: build/trans_presets.java:2537 build/trans_presets.java:2543 -#: build/trans_presets.java:2550 build/trans_presets.java:2556 -#: build/trans_presets.java:2562 build/trans_presets.java:2568 -#: build/trans_presets.java:2574 build/trans_presets.java:2580 -#: build/trans_presets.java:2587 build/trans_presets.java:2594 -#: build/trans_presets.java:2601 build/trans_presets.java:2607 -#: build/trans_presets.java:2613 build/trans_presets.java:2619 -#: build/trans_presets.java:2625 build/trans_presets.java:2631 -#: build/trans_presets.java:2638 build/trans_presets.java:2645 -#: build/trans_presets.java:2652 build/trans_presets.java:2658 -#: build/trans_presets.java:2664 build/trans_presets.java:2674 -#: build/trans_presets.java:2683 build/trans_presets.java:2698 -#: build/trans_presets.java:2704 build/trans_presets.java:2712 -#: build/trans_presets.java:2719 build/trans_presets.java:2739 -#: build/trans_presets.java:2749 build/trans_presets.java:2755 -#: build/trans_presets.java:2761 build/trans_presets.java:2767 -#: build/trans_presets.java:2773 build/trans_presets.java:2780 -#: build/trans_presets.java:2787 build/trans_presets.java:2794 -#: build/trans_presets.java:2800 build/trans_presets.java:2806 -#: build/trans_presets.java:2814 build/trans_presets.java:2821 -#: build/trans_presets.java:2828 build/trans_presets.java:2835 -#: build/trans_presets.java:2841 build/trans_presets.java:2848 -#: build/trans_presets.java:2855 build/trans_presets.java:2864 -#: build/trans_presets.java:2870 build/trans_presets.java:2876 -#: build/trans_presets.java:2882 build/trans_presets.java:2888 -#: build/trans_presets.java:2897 build/trans_presets.java:2907 -#: build/trans_presets.java:2916 build/trans_presets.java:2922 -#: build/trans_presets.java:2928 build/trans_presets.java:2933 -#: build/trans_presets.java:2939 build/trans_presets.java:2945 -#: build/trans_presets.java:2954 build/trans_presets.java:2960 -#: build/trans_presets.java:2966 build/trans_presets.java:2972 -#: build/trans_presets.java:2978 build/trans_presets.java:2984 -#: build/trans_presets.java:2990 build/trans_presets.java:2997 -#: build/trans_presets.java:3003 build/trans_presets.java:3008 -#: build/trans_presets.java:3015 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3045 build/trans_presets.java:3051 -#: build/trans_presets.java:3057 build/trans_presets.java:3064 -#: build/trans_presets.java:3070 build/trans_presets.java:3077 -#: build/trans_presets.java:3083 build/trans_presets.java:3089 -#: build/trans_presets.java:3095 build/trans_presets.java:3101 -#: build/trans_presets.java:3114 build/trans_presets.java:3128 -#: build/trans_presets.java:3142 +#: build/trans_presets.java:2451 build/trans_presets.java:2458 +#: build/trans_presets.java:2472 build/trans_presets.java:2478 +#: build/trans_presets.java:2485 build/trans_presets.java:2492 +#: build/trans_presets.java:2498 build/trans_presets.java:2504 +#: build/trans_presets.java:2526 build/trans_presets.java:2533 +#: build/trans_presets.java:2540 build/trans_presets.java:2546 +#: build/trans_presets.java:2553 build/trans_presets.java:2559 +#: build/trans_presets.java:2565 build/trans_presets.java:2571 +#: build/trans_presets.java:2577 build/trans_presets.java:2583 +#: build/trans_presets.java:2590 build/trans_presets.java:2597 +#: build/trans_presets.java:2604 build/trans_presets.java:2610 +#: build/trans_presets.java:2616 build/trans_presets.java:2622 +#: build/trans_presets.java:2628 build/trans_presets.java:2634 +#: build/trans_presets.java:2641 build/trans_presets.java:2648 +#: build/trans_presets.java:2655 build/trans_presets.java:2661 +#: build/trans_presets.java:2667 build/trans_presets.java:2677 +#: build/trans_presets.java:2686 build/trans_presets.java:2701 +#: build/trans_presets.java:2707 build/trans_presets.java:2715 +#: build/trans_presets.java:2722 build/trans_presets.java:2742 +#: build/trans_presets.java:2752 build/trans_presets.java:2758 +#: build/trans_presets.java:2764 build/trans_presets.java:2770 +#: build/trans_presets.java:2776 build/trans_presets.java:2783 +#: build/trans_presets.java:2790 build/trans_presets.java:2797 +#: build/trans_presets.java:2803 build/trans_presets.java:2809 +#: build/trans_presets.java:2817 build/trans_presets.java:2824 +#: build/trans_presets.java:2831 build/trans_presets.java:2838 +#: build/trans_presets.java:2844 build/trans_presets.java:2851 +#: build/trans_presets.java:2858 build/trans_presets.java:2867 +#: build/trans_presets.java:2873 build/trans_presets.java:2879 +#: build/trans_presets.java:2885 build/trans_presets.java:2891 +#: build/trans_presets.java:2900 build/trans_presets.java:2910 +#: build/trans_presets.java:2919 build/trans_presets.java:2925 +#: build/trans_presets.java:2931 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2948 +#: build/trans_presets.java:2957 build/trans_presets.java:2963 +#: build/trans_presets.java:2969 build/trans_presets.java:2975 +#: build/trans_presets.java:2981 build/trans_presets.java:2987 +#: build/trans_presets.java:2993 build/trans_presets.java:3000 +#: build/trans_presets.java:3006 build/trans_presets.java:3011 +#: build/trans_presets.java:3018 build/trans_presets.java:3025 +#: build/trans_presets.java:3031 build/trans_presets.java:3040 +#: build/trans_presets.java:3048 build/trans_presets.java:3054 +#: build/trans_presets.java:3060 build/trans_presets.java:3067 +#: build/trans_presets.java:3073 build/trans_presets.java:3080 +#: build/trans_presets.java:3086 build/trans_presets.java:3092 +#: build/trans_presets.java:3098 build/trans_presets.java:3104 +#: build/trans_presets.java:3117 build/trans_presets.java:3131 +#: build/trans_presets.java:3145 msgid "Name" msgstr "Nimi" @@ -6647,21 +6511,19 @@ msgid "" "Version {0} created on {1} by " -"{2} in changeset {3}" +"{2} in changeset {3}" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 -#, fuzzy msgid "Changeset info" -msgstr "Muuda seost" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 -#, fuzzy msgid "Launch browser with information about the changeset" -msgstr "Rohkem teavet sellest funktsioonist" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 -#, fuzzy, java-format +#, java-format msgid "Show changeset {0}" -msgstr "Viimane muudatus {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6679,7 +6541,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 -#, fuzzy msgid "Select filename" -msgstr "Valik" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 @@ -6720,12 +6581,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 -#, fuzzy msgid "Please select a file" -msgstr "Palun vali väärtus" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 -#, fuzzy, java-format +#, java-format msgid "Layer ''{0}'' is not backed by a file" -msgstr "parameeter ''{0}'' ei tohi olla null" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 @@ -6769,5 +6629,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 -msgid "Unsafed data and conflicts" +msgid "Unsaved data and conflicts" msgstr "" @@ -6785,5 +6645,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 -msgid "Unsafed data and missing associated file" +msgid "Unsaved data and missing associated file" msgstr "" @@ -6802,5 +6662,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 -msgid "Unsafed data non-writable files" +msgid "Unsaved data non-writable files" msgstr "" @@ -6814,7 +6674,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 -#, fuzzy msgid "Discard and Delete" -msgstr "Tühista ja välju" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -6827,7 +6686,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 -#, fuzzy msgid "Save and Delete" -msgstr "Salvesta ja välju" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356 @@ -6913,17 +6771,147 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +msgid "Filename" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124 +msgid "Use a new changeset and close it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125 +msgid "" +"Select to upload the data using a new changeset and to close the changeset " +"after the upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128 +msgid "Use a new changeset and leave it open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129 +msgid "" +"Select to upload the data using a new changeset and to leave the changeset " +"open after the upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131 +msgid "Upload to a new or to an existing changeset?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 +msgid "upload all changes in one request" +msgstr "lae kõik muudatused ühe päringuga" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 +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:171 +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:216 +msgid "Settings" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466 +msgid "Tags of new changeset" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268 +msgid "Objects to add:" +msgstr "Objektid lisada:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274 +msgid "Objects to modify:" +msgstr "Objektid muuta:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280 +msgid "Objects to delete:" +msgstr "Objektid kustutada:" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315 +#, java-format +msgid "{0} object to add:" +msgid_plural "{0} objects to add:" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324 +#, java-format +msgid "{0} object to modifiy:" +msgid_plural "{0} objects to modify:" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333 +#, java-format +msgid "{0} object to delete:" +msgid_plural "{0} objects to delete:" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422 +#, java-format +msgid "Use the existing changeset {0} and close it after upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423 +#, java-format +msgid "" +"Select to upload to the existing changeset {0} and to close the changeset " +"after this upload" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426 +#, java-format +msgid "Use the existing changeset {0} and leave it open" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427 +#, java-format +msgid "" +"Select to upload to the existing changeset {0} and to leave the changeset " +"open for further uploads" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#, java-format +msgid "Tags of changeset {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584 +msgid "Upload Changes" +msgstr "Lae muudatused üles" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586 #, fuzzy -msgid "Filename" -msgstr "Fail" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +msgid "Upload the changed primitives" +msgstr "Kas laen need muudatused üles?" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592 #, fuzzy -msgid "Upload" -msgstr "Üleslaadimine" +msgid "Please enter a comment for this upload changeset (min. 3 characters)" +msgstr "Palun sisesta koha nimi." + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593 +msgid "Illegal upload comment" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +msgid "Cancel the upload and resume editing" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 -#, fuzzy msgid "Preparing primitives to upload ..." -msgstr "Ei ole valitud primitiive mida uuendada." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 @@ -7156,5 +7144,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -7210,7 +7197,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897 -#, fuzzy msgid "Download data" -msgstr "Andmete allalaadimine" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974 @@ -7271,4 +7257,13 @@ msgid "Convert to GPX layer" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 +#, fuzzy +msgid "" +"Upload of unprocessed GPS data as map data is considered harmful." +"
If you want to upload traces, look here:" +msgstr "" +" Töötlemata GPS andmete üleslaadimist kaardi andmetena loetakse " +"kahjulikuks.
Kui soovite üles laadida radasid, vaata siia:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158 @@ -7457,5 +7452,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 msgid "Please select the row to delete." msgstr "Palun vali rida kustutamiseks" @@ -8270,8 +8265,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225 -msgid "Key:" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240 msgid "Attention: Use real keyboard keys only!" @@ -8328,5 +8319,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:351 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -8337,42 +8328,40 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136 -#, fuzzy msgid "Add a new tag" -msgstr "Lisa teele sõlm" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161 -#, fuzzy msgid "Delete the selection in the tag table" -msgstr "Kustuta valitud kiht" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427 msgid "More information about this feature" msgstr "Rohkem teavet sellest funktsioonist" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445 msgid "Optional Attributes:" msgstr "Valikulised tunnused:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:498 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:499 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492 #, java-format msgid "Use preset ''{0}''" msgstr "Kasuta eelseadet \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532 msgid "closedway" msgstr "suletud tee" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:544 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #, java-format msgid "Unknown type: {0}" msgstr "Tundmatu tüüp: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68 @@ -8383,15 +8372,15 @@ msgstr "Ei saa lugeda sildistamise eelseadeid: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:631 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624 #, java-format msgid "Error parsing {0}: " msgstr "Viga sõelumisel {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Elements of type {0} are supported." msgstr "Elemente tüübist {0} toetatakse." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:702 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8401,18 +8390,18 @@ msgstr[1] "Muuda {0} objekti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Midagi pole valitud!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 msgid "Change Properties" msgstr "Muuda seadeid" @@ -8439,5 +8428,4 @@ #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, arvatavasti puuduvad mõned sildid (tag)." @@ -8453,7 +8441,4 @@ #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:38 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184 #, java-format @@ -8529,5 +8514,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129 #, java-format msgid "Markers from {0}" @@ -8535,5 +8520,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:41 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 #, java-format msgid "File \"{0}\" does not exist" @@ -8541,5 +8526,4 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:74 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:44 #, java-format msgid "Parsing file \"{0}\" failed" @@ -8560,6 +8544,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:325 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:348 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -8569,40 +8553,40 @@ msgstr "Laen alla OSM andmeid..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -8664,10 +8648,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -8675,11 +8659,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290 msgid "Creating changeset..." -msgstr "Avan muutustekogumit..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:316 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293 #, java-format msgid "Successfully opened changeset {0}" @@ -8687,34 +8669,18 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309 -msgid "No currently open changeset. Opening a new changeset..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310 -msgid "" -"Warning: could not reuse an existing changeset as requested. Opening a new " -"one." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318 -#, fuzzy, java-format -msgid "Reusing existing changeset {0}" -msgstr "Avan muutustekogumit..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336 -#, fuzzy msgid "Updating changeset..." -msgstr "Avan muutustekogumit..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:340 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "Changeset {0} is unchanged. Skipping update." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317 +#, java-format msgid "Updating changeset {0}..." -msgstr "Avan muutustekogumit..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 msgid "" "Failed to update changeset. Either there is no current changeset or the id " @@ -8722,44 +8688,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 msgid "Closing changeset..." msgstr "Sulgen muutustekogumit..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 +#, java-format msgid "Closing changeset {0}..." -msgstr "Sulgen muutustekogumit..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 +#, java-format msgid "Leaving changeset {0} open..." -msgstr "Avan muutustekogumit..." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379 msgid "Preparing..." msgstr "Ettevalmistus..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384 msgid "Uploading..." msgstr "Üleslaadimine..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:515 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485 #, java-format msgid "Starting retry {0} of {1}." @@ -8778,10 +8744,10 @@ #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:17 msgid "OSM Server Files bzip2 compressed" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:26 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29 msgid "Invalid bz2 file." msgstr "" @@ -8839,6 +8805,11 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51 +#, java-format +msgid "(at line {0}, column {1})" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "OSM serveri failid" @@ -8867,5 +8838,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:16 msgid "OSM Server Files gzip compressed" msgstr "" @@ -8922,74 +8893,139 @@ msgstr "Viga sõelumisel." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:148 -msgid "Unknown version" -msgstr "Tundmatu versioon" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:151 -msgid "Version number missing from OSM data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:153 -#, java-format -msgid "Unknown version: {0}" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124 +#, java-format +msgid "Missing mandatory attribute ''{0}'' of XML element {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128 +#, fuzzy, java-format +msgid "Missing mandatory attribute ''{0}''" +msgstr "Puudub vajalik atribuut \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#, fuzzy, java-format +msgid "Unsupported version: {0}" +msgstr "Muudetud sellest: {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155 +#, java-format +msgid "" +"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," +"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +msgid "found XML element element not as direct child of element " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 +#, java-format +msgid "Missing mandatory attribute ''{0}'' on of way {1}" msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189 -msgid "Found element in non-way." -msgstr " element võib olla vaid way-s." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 -msgid " has zero ref" -msgstr " ei oma ref" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:204 -msgid "Found element in non-relation." -msgstr "Leidub element, mis ei ole seotud" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 -#, java-format -msgid "Missing attribute \"ref\" on member in relation {0}" +#, java-format +msgid "Illegal value of attribute ''ref'' of element . Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206 +msgid "Found XML element not as direct child of element " msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format -msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 -#, java-format -msgid "Missing attribute \"type\" on member {0} in relation {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 -#, java-format -msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." +msgid "Missing attribute ''ref'' on member in relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217 +#, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221 +#, java-format +msgid "Missing attribute ''type'' on member {0} in relation {1}" msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 +#, java-format +msgid "" +"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 msgid "Incomplete specification with ref=0" msgstr "Puudulik määratlus ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243 +#, java-format +msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261 +#, java-format +msgid "Illegal value for attribute ''uid''. Got ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 msgid "Illegal object with id=0" msgstr "Keelatud objekti number id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 -#, java-format -msgid "" -"Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 -#, java-format -msgid "Missing attribute \"version\" on OSM primitive with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 -#, java-format -msgid "Missing required attribute \"{0}\"." +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301 +#, java-format +msgid "" +"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303 +#, java-format +msgid "" +"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API " +"version is ''0.6''. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308 +#, java-format +msgid "" +"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API " +"version is ''0.5''. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#, java-format +msgid "" +"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API " +"version is ''0.5''. Got {1}" +msgstr "" + +#. should not happen. API version has been checked before +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316 +#, java-format +msgid "Unknown or unsupported API version. Got {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322 +#, java-format +msgid "Missing attribute ''version'' on OSM primitive with id {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#, fuzzy, java-format +msgid "Missing required attribute ''{0}''." msgstr "Puudub vajalik atribuut \"{0}\"." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344 +#, java-format +msgid "Illegal long value for attribute ''{0}''. Got ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 +#, java-format +msgid "" +"way with external id ''{0}'' includes missing node with external id ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381 #, java-format msgid "" @@ -8998,16 +9034,30 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429 +#, java-format +msgid "" +"Unknown relation member type ''{0}'' in relation with external id ''{1}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440 #, java-format -msgid "Unknown relation member type {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471 +msgid "" +"Relation with external id ''{0}'' refers to missing primitive with external " +"id ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481 msgid "Prepare OSM data..." msgstr "Valmistan ette OSM andmeid..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484 -msgid "Ill-formed node id" -msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482 +#, fuzzy +msgid "Parsing OSM data..." +msgstr "Valmistan ette OSM andmeid..." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487 +#, fuzzy +msgid "Preparing data set..." +msgstr "Valmistan andmeid ette..." #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 @@ -9052,33 +9102,43 @@ msgstr "Ei saanud ühendust osm serveriga. Kontrollige oma interneti-ühendust." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:104 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75 +msgid "Starting to upload with one request per primitive ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88 +#, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" -msgstr "{0}% ({1}/{2}), {3} jäänud. Laen üles {4}: {5} (id: {6})" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89 +#, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" -msgstr "{0}% ({1}/{2}), {3} jäänud. Laen üles {4}: {5} (id: {6})" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90 +#, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" -msgstr "{0}% ({1}/{2}), {3} jäänud. Laen üles {4}: {5} (id: {6})" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +msgid "Starting to upload in one request ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171 +#, fuzzy +msgid "Uploading data ..." +msgstr "Üleslaadimine..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178 +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:183 #, 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/io/OsmServerWriter.java:194 -#, fuzzy -msgid "Starting to upload in one request ..." -msgstr "Midagi pole üles laadida. Hangi esmalt andmeid." - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197 -msgid "Starting to upload with one request per primitive ..." msgstr "" @@ -9116,11 +9176,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 -#, java-format -msgid "JOSM version {0} required for plugin {1}." msgstr "" @@ -9133,4 +9188,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 +#, java-format +msgid "JOSM version {0} required for plugin {1}." +msgstr "" + #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 #, java-format @@ -9170,20 +9230,20 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:175 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 msgid "Disable plugin" msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +msgid "Keep plugin" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 -msgid "Keep plugin" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:223 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -9193,5 +9253,9 @@ "on piisavalt õigusi olemasolevate pistikrakenduste ülekirjutamiseks." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 #, java-format msgid "" @@ -9199,19 +9263,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299 msgid "Should the plugin be disabled?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -9219,13 +9283,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:317 msgid "The plugin could not be removed. Probably it was already disabled" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361 msgid "Plugin information" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:355 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:367 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" @@ -9282,4 +9346,35 @@ "{0}" +#. item "Ways/Cycleway" combo "Pedestrians" +#. item "Ways/Footway" combo "Bikes" +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 +#: build/trans_presets.java:323 build/trans_presets.java:324 +#: build/trans_presets.java:325 build/trans_presets.java:326 +#: build/trans_presets.java:327 build/trans_presets.java:328 +#: build/trans_presets.java:329 build/trans_presets.java:330 +#: build/trans_presets.java:331 build/trans_presets.java:332 +#: build/trans_presets.java:333 build/trans_presets.java:449 +#: build/trans_presets.java:469 build/trans_presets.java:529 +#: build/trans_presets.java:530 build/trans_presets.java:531 +#: build/trans_presets.java:550 build/trans_presets.java:551 +#: build/trans_presets.java:552 build/trans_presets.java:571 +#: build/trans_presets.java:572 build/trans_presets.java:573 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:613 +#: build/trans_presets.java:614 build/trans_presets.java:615 +#: build/trans_presets.java:634 build/trans_presets.java:635 +#: build/trans_presets.java:636 build/trans_presets.java:773 +#: build/trans_presets.java:788 build/trans_presets.java:1330 +#: build/trans_presets.java:1397 build/trans_presets.java:1398 +#: build/trans_presets.java:1399 build/trans_presets.java:2442 +#: build/trans_presets.java:2443 build/trans_presets.java:2444 +msgid "unknown" +msgstr "tundmatu" + #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #, java-format @@ -9349,4 +9444,88 @@ msgstr "(Tekst on juba kopeeritud clipboardi.)" +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:32 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.
Check " +"the server URL in your preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:47 +#, 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." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:62 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:132 +#, java-format +msgid "" +"Failed to upload data to or download data from
''{0}''
due to a " +"problem with transferring data.
Details(untranslated): {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148 +#, java-format +msgid "" +"The OSM server
''{0}''
reported an internal server error." +"
This is most likely a temporary problem. Please try again later." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:162 +#, java-format +msgid "The OSM server ''{0}'' reported a bad request.
" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165 +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 "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168 +#, java-format +msgid "
Error message(untranslated): {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/tools/I18n.java:120 #, java-format @@ -9416,5 +9595,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:104 #, java-format msgid "" @@ -9423,5 +9602,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 #, java-format msgid "" @@ -9430,5 +9609,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 #, java-format msgid "" @@ -9437,5 +9616,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 #, java-format msgid "" @@ -9444,5 +9623,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153 +#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 #, java-format msgid "" @@ -9501,40 +9680,39 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:134 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135 msgid "Visibility" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136 msgid "Defines the visibility of your trace for other OSM users." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139 -#, fuzzy +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" -msgstr "http://www.openstreetmap.org/traces" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139 +msgstr "" + +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140 msgid "(What does that mean?)" msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:141 -#: build/trans_presets.java:3145 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 +#: build/trans_presets.java:3148 msgid "Description" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 msgid "Please enter Description about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:144 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145 msgid "Tags (comma delimited)" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:146 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:192 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:193 #, java-format msgid "Selected track: {0}" @@ -9542,47 +9720,47 @@ #. Set progress dialog to indeterminate while connecting -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:215 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:216 msgid "Connecting..." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:239 msgid "Upload cancelled" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:248 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:249 msgid "Error while uploading" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:302 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 msgid "GPX upload was successful" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 msgid "Upload failed. Server returned the following message: " msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:378 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:380 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:402 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:381 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:403 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:383 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:384 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:386 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:387 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:418 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:419 msgid "Uploading GPX Track" msgstr "" @@ -9791,5 +9969,5 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:575 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "" @@ -9803,13 +9981,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:587 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:591 msgid "You should select a GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592 msgid "No selected GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:600 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:604 #, java-format msgid "" @@ -9818,9 +9996,9 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605 msgid "Invalid timezone" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:613 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:617 #, java-format msgid "" @@ -9829,65 +10007,65 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:657 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:661 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:662 msgid "GPX Track loaded" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:693 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:697 msgid "The selected photos don't contain time information." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:698 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:728 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:732 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:729 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:733 msgid "GPX Track has no time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Timezone: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779 #, java-format msgid "Minutes: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780 #, java-format msgid "Seconds: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:793 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:797 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:796 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:800 #, java-format msgid "(Time difference of {0} days)" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:803 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:807 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:865 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -9895,13 +10073,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871 msgid "Matching photos to track failed" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:883 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Adjust timezone and offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 msgid "Default Values" msgstr "" @@ -9939,5 +10117,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421 msgid "Error loading file" msgstr "" @@ -9984,13 +10162,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -9999,13 +10177,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267 #, java-format msgid "" @@ -10115,9 +10293,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79 msgid "Auto-tag source added:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84 msgid "Add \"source=...\" to elements?" msgstr "" @@ -10270,7 +10448,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 -#, fuzzy msgid "Set " -msgstr "Vali" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 @@ -10354,5 +10531,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184 msgid "Blank Layer" msgstr "" @@ -11274,18 +11451,18 @@ msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 msgid "Open Visible..." msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:49 msgid "Open only files that are visible in current view." msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:59 msgid "No view open - cannot determine boundaries!" msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:114 #, java-format msgid "Unknown file extension: {0}" @@ -11296,5 +11473,5 @@ msgstr "" -#: ../plugins/osmarender/src/OsmarenderPlugin.java:94 +#: ../plugins/osmarender/src/OsmarenderPlugin.java:93 msgid "" "Firefox not found. Please set firefox executable in the Map Settings page of " @@ -11302,9 +11479,9 @@ msgstr "" +#: ../plugins/osmarender/src/OsmarenderPlugin.java:124 +msgid "osmarender options" +msgstr "" + #: ../plugins/osmarender/src/OsmarenderPlugin.java:125 -msgid "osmarender options" -msgstr "" - -#: ../plugins/osmarender/src/OsmarenderPlugin.java:126 msgid "Firefox executable" msgstr "" @@ -11315,28 +11492,33 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#, fuzzy +msgid "create new objects" +msgstr "Loo uus sõlm." + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the selection" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "change the viewport" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30 msgid "confirm all Remote Control actions manually" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "Remote Control" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "Settings for the Remote Control plugin." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -11345,28 +11527,34 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41 msgid "Permitted actions" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 msgid "Remote Control has been asked to load data from the API." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124 #, java-format msgid "Request details: {0}" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:223 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 msgid "Do you want to allow this?" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:224 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:221 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226 +msgid "Remote Control has been asked to create a new node." +msgstr "" + +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -11857,25 +12045,33 @@ msgstr "" +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295 +msgid "Enter values for all conflicts." +msgstr "Sisesta kõigi vastuolude kohta väärtused." + +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 +msgid "Solve Conflicts" +msgstr "Lahenda vastuolud." + #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461 msgid "Removed Element from Relations" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586 msgid "Closed Way" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853 msgid "Remove tags from inner ways" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880 +#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882 msgid "Join Areas Function" msgstr "" @@ -11949,6 +12145,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:36 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:92 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:83 msgid "Validation errors" msgstr "" @@ -11958,10 +12154,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:165 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167 msgid "Grid" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #, java-format msgid "" @@ -12048,51 +12244,65 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82 msgid "Open the validation window." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:79 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:89 msgid "Zoom to problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:110 msgid "Fix" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:110 msgid "Fix the selected errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114 msgid "Ignore" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115 msgid "Ignore the selected errors next time." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188 +#: ../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:188 +#: ../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:188 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 msgid "Nothing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:189 +#: ../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:190 +#: ../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 +msgid "Fixing errors ..." +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484 +#, java-format +msgid "Fixing ({0}/{1}): ''{2}''" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501 +#, fuzzy +msgid "Updating map ..." +msgstr "Andmete värskendamine" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -12131,18 +12341,18 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:72 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:43 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58 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:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84 msgid "Nodes at same position" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143 msgid "Confirmation" msgstr "" @@ -12150,7 +12360,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76 -#, fuzzy msgid "Duplicated ways" -msgstr "Kahekordista" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59 @@ -12161,7 +12370,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141 -#, fuzzy msgid "Delete duplicate ways" -msgstr "Kustuta sõlmi või teid" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -12726,5 +12934,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56 +#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 msgid "Exception occurred" msgstr "" @@ -12808,5 +13016,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -12814,5 +13022,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:201 msgid "No valid WMS URL or id" msgstr "" @@ -12830,17 +13038,17 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "No layers to adjust" msgstr "" @@ -12881,19 +13089,18 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 -#, fuzzy msgid "(deactivated)" -msgstr "kasutusest väljas" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:143 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 #, java-format msgid "" @@ -12904,108 +13111,119 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:194 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:381 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:392 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:393 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171 msgid "WMS" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184 msgid "Open a blank WMS layer to load data from a file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "WMS Plugin Preferences" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59 msgid "WMS URL (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112 +msgid "Copy Selected Default(s)" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 +msgid "Please select at least one row to copy." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 +msgid "Downloader:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171 #, fuzzy -msgid "Copy Selected Default(s)" -msgstr "Suurenda valitud elementidele" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110 -#, fuzzy -msgid "Please select at least one row to copy." -msgstr "Palun vali vähemalt üks tee." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154 -msgid "Downloader:" +msgid "Overlap tiles" +msgstr "Kattuvad alad" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 +msgid "% of east:" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 +msgid "% of north:" msgstr "" @@ -13371,5 +13589,5 @@ #: build/trans_presets.java:120 build/trans_presets.java:140 #: build/trans_presets.java:177 build/trans_presets.java:197 -#: build/trans_presets.java:1557 build/trans_presets.java:3143 +#: build/trans_presets.java:1557 build/trans_presets.java:3146 msgid "Reference" msgstr "" @@ -13911,7 +14129,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "asphalt" -msgstr "tervishoid" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -13932,8 +14149,7 @@ #: build/trans_presets.java:471 build/trans_presets.java:490 #: build/trans_presets.java:509 build/trans_presets.java:665 -#: build/trans_presets.java:1306 -#, fuzzy +#: build/trans_presets.java:1306 build/trans_presets.java:2434 msgid "metal" -msgstr "Kaubandus" +msgstr "" #. color heath @@ -13951,5 +14167,6 @@ #: build/trans_presets.java:471 build/trans_presets.java:490 #: build/trans_presets.java:509 build/trans_presets.java:665 -#: build/trans_presets.java:1306 build/trans_style.java:3367 +#: build/trans_presets.java:1306 build/trans_presets.java:2434 +#: build/trans_style.java:3367 msgid "wood" msgstr "mets" @@ -13962,7 +14179,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "paving_stones" -msgstr "parkimis_pilet" +msgstr "" #. item "Ways/Track Grade 2" combo "Surface" @@ -13998,7 +14214,6 @@ #: build/trans_presets.java:509 build/trans_presets.java:665 #: build/trans_presets.java:1306 -#, fuzzy msgid "pebblestone" -msgstr "valik" +msgstr "" #: build/trans_presets.java:242 build/trans_presets.java:260 @@ -14212,4 +14427,5 @@ #. item "Tourism/Audioguide" combo "Fee" #. item "Amenities/Toilets" combo "Fee" +#. item "Amenities/Bench" combo "Backrest" #. item "Amenities/Hunting Stand" combo "Shelter" #. item "Amenities/Hunting Stand" combo "Hide" @@ -14238,12 +14454,12 @@ #: build/trans_presets.java:1398 build/trans_presets.java:1399 #: build/trans_presets.java:1763 build/trans_presets.java:1773 -#: build/trans_presets.java:2397 build/trans_presets.java:2439 -#: build/trans_presets.java:2440 build/trans_presets.java:2441 -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2397 build/trans_presets.java:2433 +#: build/trans_presets.java:2442 build/trans_presets.java:2443 +#: build/trans_presets.java:2444 build/trans_presets.java:2714 msgid "yes" msgstr "" #. color permissive -#. +#. #. 1 #. 40000 @@ -14291,5 +14507,5 @@ #. color private -#. +#. #. 1 #. 40000 @@ -14326,5 +14542,5 @@ #. #. -#. +#. #. 1 #. 50000 @@ -14388,6 +14604,7 @@ #: build/trans_presets.java:1399 build/trans_presets.java:1763 #: build/trans_presets.java:1773 build/trans_presets.java:2397 -#: build/trans_presets.java:2439 build/trans_presets.java:2440 -#: build/trans_presets.java:2441 build/trans_presets.java:2711 +#: build/trans_presets.java:2433 build/trans_presets.java:2442 +#: build/trans_presets.java:2443 build/trans_presets.java:2444 +#: build/trans_presets.java:2714 msgid "no" msgstr "" @@ -14533,6 +14750,6 @@ #: build/trans_presets.java:788 build/trans_presets.java:1135 #: build/trans_presets.java:1392 build/trans_presets.java:2353 -#: build/trans_presets.java:2898 build/trans_presets.java:2908 -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2901 build/trans_presets.java:2911 +#: build/trans_presets.java:2920 msgid "Type" msgstr "" @@ -14803,7 +15020,6 @@ #. item "Ways/Cycleway" check "Embankment" #: build/trans_presets.java:449 -#, fuzzy msgid "Pedestrians" -msgstr "presbüterlane" +msgstr "" #. item "Ways/Cycleway" text "Width (meters)" @@ -14822,7 +15038,6 @@ #. item "Ways/Footway" check "Embankment" #: build/trans_presets.java:469 -#, fuzzy msgid "Bikes" -msgstr "Pagar" +msgstr "" #. item "Ways/Footway" text "Width (meters)" @@ -15114,7 +15329,7 @@ #: build/trans_presets.java:2384 build/trans_presets.java:2395 #: build/trans_presets.java:2403 build/trans_presets.java:2410 -#: build/trans_presets.java:2461 build/trans_presets.java:2509 -#: build/trans_presets.java:2675 build/trans_presets.java:2690 -#: build/trans_presets.java:2729 build/trans_presets.java:3148 +#: build/trans_presets.java:2464 build/trans_presets.java:2512 +#: build/trans_presets.java:2678 build/trans_presets.java:2693 +#: build/trans_presets.java:2732 build/trans_presets.java:3151 msgid "Operator" msgstr "Operaatorfirma" @@ -15327,6 +15542,6 @@ #. item "Places/Volcano" text "Name" #: build/trans_presets.java:842 build/trans_presets.java:1600 -#: build/trans_presets.java:1745 build/trans_presets.java:2842 -#: build/trans_presets.java:2849 build/trans_presets.java:2856 +#: build/trans_presets.java:1745 build/trans_presets.java:2845 +#: build/trans_presets.java:2852 build/trans_presets.java:2859 msgid "Elevation" msgstr "" @@ -16238,7 +16453,4 @@ #. item "Sport Facilities/Miniature Golf" text "Name" #. item "Buildings/Library" text "Name" -#. item -#. -#. #. item "Amenities/Baby Hatch" text "Operator" #. item "Shops/Supermarket" text "Name" @@ -16286,23 +16498,23 @@ #: build/trans_presets.java:1818 build/trans_presets.java:1909 #: build/trans_presets.java:1915 build/trans_presets.java:2226 -#: build/trans_presets.java:2250 build/trans_presets.java:2433 -#: build/trans_presets.java:2462 build/trans_presets.java:2470 -#: build/trans_presets.java:2476 build/trans_presets.java:2483 -#: build/trans_presets.java:2490 build/trans_presets.java:2496 -#: build/trans_presets.java:2502 build/trans_presets.java:2524 -#: build/trans_presets.java:2531 build/trans_presets.java:2538 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2563 -#: build/trans_presets.java:2569 build/trans_presets.java:2575 -#: build/trans_presets.java:2581 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2602 -#: build/trans_presets.java:2608 build/trans_presets.java:2614 -#: build/trans_presets.java:2620 build/trans_presets.java:2626 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2653 -#: build/trans_presets.java:2659 build/trans_presets.java:2665 -#: build/trans_presets.java:2676 build/trans_presets.java:2684 -#: build/trans_presets.java:2699 build/trans_presets.java:2705 -#: build/trans_presets.java:2713 build/trans_presets.java:2740 +#: build/trans_presets.java:2250 build/trans_presets.java:2465 +#: build/trans_presets.java:2473 build/trans_presets.java:2479 +#: build/trans_presets.java:2486 build/trans_presets.java:2493 +#: build/trans_presets.java:2499 build/trans_presets.java:2505 +#: build/trans_presets.java:2527 build/trans_presets.java:2534 +#: build/trans_presets.java:2541 build/trans_presets.java:2547 +#: build/trans_presets.java:2554 build/trans_presets.java:2560 +#: build/trans_presets.java:2566 build/trans_presets.java:2572 +#: build/trans_presets.java:2578 build/trans_presets.java:2584 +#: build/trans_presets.java:2591 build/trans_presets.java:2598 +#: build/trans_presets.java:2605 build/trans_presets.java:2611 +#: build/trans_presets.java:2617 build/trans_presets.java:2623 +#: build/trans_presets.java:2629 build/trans_presets.java:2635 +#: build/trans_presets.java:2642 build/trans_presets.java:2649 +#: build/trans_presets.java:2656 build/trans_presets.java:2662 +#: build/trans_presets.java:2668 build/trans_presets.java:2679 +#: build/trans_presets.java:2687 build/trans_presets.java:2702 +#: build/trans_presets.java:2708 build/trans_presets.java:2716 +#: build/trans_presets.java:2743 msgid "Opening Hours" msgstr "Avatud" @@ -16326,5 +16538,4 @@ #. item "Buildings/Library" combo "Opening Hours" #. item "Buildings/Place of Worship" combo "Opening Hours" -#. item "Amenities/Bench" combo "Opening Hours" #. item "Shops/Supermarket" combo "Opening Hours" #. item "Shops/Chemist" combo "Opening Hours" @@ -16371,22 +16582,22 @@ #: build/trans_presets.java:1909 build/trans_presets.java:1915 #: build/trans_presets.java:2226 build/trans_presets.java:2250 -#: build/trans_presets.java:2433 build/trans_presets.java:2470 -#: build/trans_presets.java:2476 build/trans_presets.java:2483 -#: build/trans_presets.java:2490 build/trans_presets.java:2496 -#: build/trans_presets.java:2502 build/trans_presets.java:2524 -#: build/trans_presets.java:2531 build/trans_presets.java:2538 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2563 -#: build/trans_presets.java:2569 build/trans_presets.java:2575 -#: build/trans_presets.java:2581 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2602 -#: build/trans_presets.java:2608 build/trans_presets.java:2614 -#: build/trans_presets.java:2620 build/trans_presets.java:2626 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2653 -#: build/trans_presets.java:2659 build/trans_presets.java:2665 -#: build/trans_presets.java:2676 build/trans_presets.java:2684 -#: build/trans_presets.java:2699 build/trans_presets.java:2705 -#: build/trans_presets.java:2713 build/trans_presets.java:2740 +#: build/trans_presets.java:2473 build/trans_presets.java:2479 +#: build/trans_presets.java:2486 build/trans_presets.java:2493 +#: build/trans_presets.java:2499 build/trans_presets.java:2505 +#: build/trans_presets.java:2527 build/trans_presets.java:2534 +#: build/trans_presets.java:2541 build/trans_presets.java:2547 +#: build/trans_presets.java:2554 build/trans_presets.java:2560 +#: build/trans_presets.java:2566 build/trans_presets.java:2572 +#: build/trans_presets.java:2578 build/trans_presets.java:2584 +#: build/trans_presets.java:2591 build/trans_presets.java:2598 +#: build/trans_presets.java:2605 build/trans_presets.java:2611 +#: build/trans_presets.java:2617 build/trans_presets.java:2623 +#: build/trans_presets.java:2629 build/trans_presets.java:2635 +#: build/trans_presets.java:2642 build/trans_presets.java:2649 +#: build/trans_presets.java:2656 build/trans_presets.java:2662 +#: build/trans_presets.java:2668 build/trans_presets.java:2679 +#: build/trans_presets.java:2687 build/trans_presets.java:2702 +#: build/trans_presets.java:2708 build/trans_presets.java:2716 +#: build/trans_presets.java:2743 msgid "24/7" msgstr "" @@ -16401,22 +16612,22 @@ #: build/trans_presets.java:1909 build/trans_presets.java:1915 #: build/trans_presets.java:2226 build/trans_presets.java:2250 -#: build/trans_presets.java:2433 build/trans_presets.java:2470 -#: build/trans_presets.java:2476 build/trans_presets.java:2483 -#: build/trans_presets.java:2490 build/trans_presets.java:2496 -#: build/trans_presets.java:2502 build/trans_presets.java:2524 -#: build/trans_presets.java:2531 build/trans_presets.java:2538 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2563 -#: build/trans_presets.java:2569 build/trans_presets.java:2575 -#: build/trans_presets.java:2581 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2602 -#: build/trans_presets.java:2608 build/trans_presets.java:2614 -#: build/trans_presets.java:2620 build/trans_presets.java:2626 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2653 -#: build/trans_presets.java:2659 build/trans_presets.java:2665 -#: build/trans_presets.java:2676 build/trans_presets.java:2684 -#: build/trans_presets.java:2699 build/trans_presets.java:2705 -#: build/trans_presets.java:2713 build/trans_presets.java:2740 +#: build/trans_presets.java:2473 build/trans_presets.java:2479 +#: build/trans_presets.java:2486 build/trans_presets.java:2493 +#: build/trans_presets.java:2499 build/trans_presets.java:2505 +#: build/trans_presets.java:2527 build/trans_presets.java:2534 +#: build/trans_presets.java:2541 build/trans_presets.java:2547 +#: build/trans_presets.java:2554 build/trans_presets.java:2560 +#: build/trans_presets.java:2566 build/trans_presets.java:2572 +#: build/trans_presets.java:2578 build/trans_presets.java:2584 +#: build/trans_presets.java:2591 build/trans_presets.java:2598 +#: build/trans_presets.java:2605 build/trans_presets.java:2611 +#: build/trans_presets.java:2617 build/trans_presets.java:2623 +#: build/trans_presets.java:2629 build/trans_presets.java:2635 +#: build/trans_presets.java:2642 build/trans_presets.java:2649 +#: build/trans_presets.java:2656 build/trans_presets.java:2662 +#: build/trans_presets.java:2668 build/trans_presets.java:2679 +#: build/trans_presets.java:2687 build/trans_presets.java:2702 +#: build/trans_presets.java:2708 build/trans_presets.java:2716 +#: build/trans_presets.java:2743 msgid "Mo-Fr 08:30-20:00" msgstr "" @@ -16431,22 +16642,22 @@ #: build/trans_presets.java:1909 build/trans_presets.java:1915 #: build/trans_presets.java:2226 build/trans_presets.java:2250 -#: build/trans_presets.java:2433 build/trans_presets.java:2470 -#: build/trans_presets.java:2476 build/trans_presets.java:2483 -#: build/trans_presets.java:2490 build/trans_presets.java:2496 -#: build/trans_presets.java:2502 build/trans_presets.java:2524 -#: build/trans_presets.java:2531 build/trans_presets.java:2538 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2563 -#: build/trans_presets.java:2569 build/trans_presets.java:2575 -#: build/trans_presets.java:2581 build/trans_presets.java:2588 -#: build/trans_presets.java:2595 build/trans_presets.java:2602 -#: build/trans_presets.java:2608 build/trans_presets.java:2614 -#: build/trans_presets.java:2620 build/trans_presets.java:2626 -#: build/trans_presets.java:2632 build/trans_presets.java:2639 -#: build/trans_presets.java:2646 build/trans_presets.java:2653 -#: build/trans_presets.java:2659 build/trans_presets.java:2665 -#: build/trans_presets.java:2676 build/trans_presets.java:2684 -#: build/trans_presets.java:2699 build/trans_presets.java:2705 -#: build/trans_presets.java:2713 build/trans_presets.java:2740 +#: build/trans_presets.java:2473 build/trans_presets.java:2479 +#: build/trans_presets.java:2486 build/trans_presets.java:2493 +#: build/trans_presets.java:2499 build/trans_presets.java:2505 +#: build/trans_presets.java:2527 build/trans_presets.java:2534 +#: build/trans_presets.java:2541 build/trans_presets.java:2547 +#: build/trans_presets.java:2554 build/trans_presets.java:2560 +#: build/trans_presets.java:2566 build/trans_presets.java:2572 +#: build/trans_presets.java:2578 build/trans_presets.java:2584 +#: build/trans_presets.java:2591 build/trans_presets.java:2598 +#: build/trans_presets.java:2605 build/trans_presets.java:2611 +#: build/trans_presets.java:2617 build/trans_presets.java:2623 +#: build/trans_presets.java:2629 build/trans_presets.java:2635 +#: build/trans_presets.java:2642 build/trans_presets.java:2649 +#: build/trans_presets.java:2656 build/trans_presets.java:2662 +#: build/trans_presets.java:2668 build/trans_presets.java:2679 +#: build/trans_presets.java:2687 build/trans_presets.java:2702 +#: build/trans_presets.java:2708 build/trans_presets.java:2716 +#: build/trans_presets.java:2743 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -16480,5 +16691,5 @@ #: build/trans_presets.java:1391 build/trans_presets.java:1762 #: build/trans_presets.java:1772 build/trans_presets.java:2396 -#: build/trans_presets.java:2510 +#: build/trans_presets.java:2513 msgid "Reference number" msgstr "" @@ -16725,5 +16936,5 @@ #. #: build/trans_presets.java:1532 build/trans_presets.java:1785 -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2442 msgid "Shelter" msgstr "" @@ -17108,7 +17319,6 @@ #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1720 -#, fuzzy msgid "topo" -msgstr "kuni" +msgstr "" #. color tertiary @@ -17155,23 +17365,19 @@ #: build/trans_presets.java:1721 -#, fuzzy msgid "Shown Area" -msgstr "Allalaetav ala" +msgstr "" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1721 -#, fuzzy msgid "site" -msgstr "Kleebi" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "city" -msgstr "Linn" +msgstr "" #: build/trans_presets.java:1721 -#, fuzzy msgid "region" -msgstr "kohalik" +msgstr "" #. item "Tourism/Other Information Points" text "Name" @@ -17199,7 +17405,6 @@ #. item "Tourism/Guidepost" check "Cycling" #: build/trans_presets.java:1727 build/trans_presets.java:1750 -#, fuzzy msgid "Mountainbiking" -msgstr "Purskaev" +msgstr "" #. item "Tourism/Map" check "Mountainbiking" @@ -17213,7 +17418,6 @@ #. item "Tourism/Guidepost" check "Skiing" #: build/trans_presets.java:1729 build/trans_presets.java:1752 -#, fuzzy msgid "Riding" -msgstr "Ehirus" +msgstr "" #. item "Tourism/Map" check "Riding" @@ -17230,13 +17434,11 @@ #. item "Tourism/Information Board" text "Name" #: build/trans_presets.java:1737 -#, fuzzy msgid "Board Content" -msgstr "Vali kontinent" +msgstr "" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1737 -#, fuzzy msgid "notice" -msgstr "murdmaa" +msgstr "" #: build/trans_presets.java:1737 @@ -17263,19 +17465,16 @@ #. item "Tourism/Guidepost" label "... other transportation modes possible" #: build/trans_presets.java:1755 -#, fuzzy msgid "Information Terminal" -msgstr "Info" +msgstr "" #. item "Tourism/Information Terminal" text "Name" #. item "Tourism/Audioguide" text "Name" #: build/trans_presets.java:1760 build/trans_presets.java:1770 -#, fuzzy msgid "Closer description" -msgstr "sümboolne kirjeldus" +msgstr "" #: build/trans_presets.java:1765 -#, fuzzy msgid "Audioguide" -msgstr "Heli" +msgstr "" #. @@ -17286,7 +17485,6 @@ #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1776 -#, fuzzy msgid "Phone number" -msgstr "Telefoninumber" +msgstr "" #. item "Tourism/Audioguide" text "Phone number" @@ -17610,5 +17808,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -17642,5 +17840,5 @@ #. #. color sport -#. +#. #. 1 #. 50000 @@ -18766,6 +18964,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2248 build/trans_presets.java:3029 -#: build/trans_presets.java:3038 +#: build/trans_presets.java:2248 build/trans_presets.java:3032 +#: build/trans_presets.java:3041 msgid "Religion" msgstr "Religioon" @@ -18774,66 +18972,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2248 build/trans_presets.java:3029 -#: build/trans_presets.java:3038 +#: build/trans_presets.java:2248 build/trans_presets.java:3032 +#: build/trans_presets.java:3041 msgid "bahai" msgstr "" -#: build/trans_presets.java:2248 build/trans_presets.java:3029 -#: build/trans_presets.java:3038 +#: build/trans_presets.java:2248 build/trans_presets.java:3032 +#: build/trans_presets.java:3041 msgid "buddhist" msgstr "budist" -#: build/trans_presets.java:2248 build/trans_presets.java:3029 -#: build/trans_presets.java:3038 +#: build/trans_presets.java:2248 build/trans_presets.java:3032 +#: build/trans_presets.java:3041 msgid "christian" msgstr "kristlane" -#: build/trans_presets.java:2248 build/trans_presets.java:3029 -#: build/trans_presets.java:3038 +#: build/trans_presets.java:2248 build/trans_presets.java:3032 +#: build/trans_presets.java:3041 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2248 build/trans_presets.java:3029 -#: build/trans_presets.java:3038 +#: build/trans_presets.java:2248 build/trans_presets.java:3032 +#: build/trans_presets.java:3041 msgid "jain" msgstr "" -#: build/trans_presets.java:2248 build/trans_presets.java:3029 -#: build/trans_presets.java:3038 +#: build/trans_presets.java:2248 build/trans_presets.java:3032 +#: build/trans_presets.java:3041 msgid "jewish" msgstr "juudi" -#: build/trans_presets.java:2248 build/trans_presets.java:3029 -#: build/trans_presets.java:3038 +#: build/trans_presets.java:2248 build/trans_presets.java:3032 +#: build/trans_presets.java:3041 msgid "muslim" msgstr "moslem" -#: build/trans_presets.java:2248 build/trans_presets.java:3029 -#: build/trans_presets.java:3038 +#: build/trans_presets.java:2248 build/trans_presets.java:3032 +#: build/trans_presets.java:3041 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2248 build/trans_presets.java:3029 -#: build/trans_presets.java:3038 +#: build/trans_presets.java:2248 build/trans_presets.java:3032 +#: build/trans_presets.java:3041 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2248 build/trans_presets.java:3029 -#: build/trans_presets.java:3038 +#: build/trans_presets.java:2248 build/trans_presets.java:3032 +#: build/trans_presets.java:3041 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2248 build/trans_presets.java:3029 -#: build/trans_presets.java:3038 +#: build/trans_presets.java:2248 build/trans_presets.java:3032 +#: build/trans_presets.java:3041 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2248 build/trans_presets.java:3029 -#: build/trans_presets.java:3038 +#: build/trans_presets.java:2248 build/trans_presets.java:3032 +#: build/trans_presets.java:3041 msgid "zoroastrian" msgstr "zoroastrism (pärsia)" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "Denomination" msgstr "Usutunnistus" @@ -18842,76 +19040,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "anglican" msgstr "anglikaan" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "catholic" msgstr "katoliku" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "evangelical" msgstr "evangeelne" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "jehovahs_witness" msgstr "jehoovatunnistajad" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "lutheran" msgstr "luterlane" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "methodist" msgstr "metodist" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "mormon" msgstr "mormoon" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "orthodox" msgstr "ortodoksne" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "pentecostal" msgstr "nelipühalane" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "presbyterian" msgstr "presbüterlane" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "protestant" msgstr "protestantlik" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "quaker" msgstr "kveeker" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "shia" msgstr "šiia" -#: build/trans_presets.java:2249 build/trans_presets.java:3030 -#: build/trans_presets.java:3039 +#: build/trans_presets.java:2249 build/trans_presets.java:3033 +#: build/trans_presets.java:3042 msgid "sunni" msgstr "" @@ -19243,5 +19441,5 @@ #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2398 build/trans_presets.java:2511 +#: build/trans_presets.java:2398 build/trans_presets.java:2514 msgid "Note" msgstr "Märkus" @@ -19266,5 +19464,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2411 build/trans_presets.java:2512 +#: build/trans_presets.java:2411 build/trans_presets.java:2515 msgid "Coins" msgstr "Mündid" @@ -19272,5 +19470,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2412 build/trans_presets.java:2513 +#: build/trans_presets.java:2412 build/trans_presets.java:2516 msgid "Notes" msgstr "Märkused" @@ -19278,5 +19476,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2413 build/trans_presets.java:2514 +#: build/trans_presets.java:2413 build/trans_presets.java:2517 msgid "Electronic purses and Charge cards" msgstr "" @@ -19284,5 +19482,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2414 build/trans_presets.java:2515 +#: build/trans_presets.java:2414 build/trans_presets.java:2518 msgid "Debit cards" msgstr "Deebetkaart" @@ -19290,5 +19488,5 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2415 build/trans_presets.java:2516 +#: build/trans_presets.java:2415 build/trans_presets.java:2519 msgid "Credit cards" msgstr "Krediitkaart" @@ -19347,10 +19545,142 @@ msgstr "" +#. item +#. +#. +#: build/trans_presets.java:2433 +#, fuzzy +msgid "Backrest" +msgstr "Tagasi" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "Material" +msgstr "Mälestusmärk" + +#. item "Amenities/Bench" combo "Material" +#: build/trans_presets.java:2434 +#, fuzzy +msgid "stone" +msgstr "Kleebi" + +#: build/trans_presets.java:2434 +#, fuzzy +msgid "plastic" +msgstr "koht" + #: build/trans_presets.java:2435 +#, fuzzy +msgid "Colour" +msgstr "Värv" + +#. item "Amenities/Bench" combo "Colour" +#: build/trans_presets.java:2435 +#, fuzzy +msgid "black" +msgstr "Tagasi" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "brown" +msgstr "Alla" + +#. color historic +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color green +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color green +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color green +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color forest +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color green +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color cemetery +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color green +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_presets.java:2435 build/trans_style.java:3055 +#: build/trans_style.java:3063 build/trans_style.java:3071 +#: build/trans_style.java:3079 build/trans_style.java:3127 +#: build/trans_style.java:3135 build/trans_style.java:3233 +#: build/trans_style.java:3241 +msgid "green" +msgstr "roheala" + +#: build/trans_presets.java:2435 +msgid "red" +msgstr "" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "blue" +msgstr "Väärtus" + +#: build/trans_presets.java:2435 +#, fuzzy +msgid "white" +msgstr "hotell" + +#: build/trans_presets.java:2436 +msgid "Amount of Seats" +msgstr "" + +#. item "Amenities/Bench" combo "Amount of Seats" +#: build/trans_presets.java:2438 msgid "Hunting Stand" msgstr "Jahikantsel" #. item -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2439 msgid "Edit Hunting Stand" msgstr "Muuda jahiala" @@ -19359,30 +19689,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2438 build/trans_presets.java:2899 +#: build/trans_presets.java:2441 build/trans_presets.java:2902 msgid "Height" msgstr "Kõrgus" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "low" msgstr "madal" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "half" msgstr "pool" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2441 msgid "full" msgstr "täis" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2443 msgid "Hide" msgstr "Peida" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2444 msgid "Lock" msgstr "Lukusta" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2446 msgid "Fountain" msgstr "Purskaev" @@ -19391,10 +19721,10 @@ #. -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2449 msgid "Edit Fountain" msgstr "Vali purskaev" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2453 msgid "Drinking Water" msgstr "Joogi vesi" @@ -19403,10 +19733,10 @@ #. -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2456 msgid "Edit Drinking Water" msgstr "Vali joogivee asukoht" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2460 msgid "Baby Hatch" msgstr "" @@ -19414,34 +19744,33 @@ #. item #. -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2462 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2465 +#: build/trans_presets.java:2468 msgid "Shops" msgstr "Poed" #. group "Shops" -#: build/trans_presets.java:2466 +#: build/trans_presets.java:2469 msgid "Supermarket" msgstr "Supermarket" #. item -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2470 msgid "Edit Supermarket" msgstr "Vali Supermarket" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2475 msgid "Chemist" msgstr "" #. item -#: build/trans_presets.java:2473 -#, fuzzy +#: build/trans_presets.java:2476 msgid "Edit Chemist" -msgstr "Vali linn" - -#: build/trans_presets.java:2478 +msgstr "" + +#: build/trans_presets.java:2481 msgid "Convenience Store" msgstr "Nurgakauplus" @@ -19449,9 +19778,9 @@ #. item #. -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2483 msgid "Edit Convenience Store" msgstr "Vali nurgakauplus" -#: build/trans_presets.java:2485 +#: build/trans_presets.java:2488 msgid "Kiosk" msgstr "Kiosk" @@ -19459,29 +19788,27 @@ #. item #. -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2490 msgid "Edit Kiosk" msgstr "Vali kiosk" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2495 msgid "Book Store" msgstr "" #. item -#: build/trans_presets.java:2493 -#, fuzzy +#: build/trans_presets.java:2496 msgid "Edit Book Store" -msgstr "Vali arstid" - -#: build/trans_presets.java:2498 +msgstr "" + +#: build/trans_presets.java:2501 msgid "Travel Agency" msgstr "" #. item -#: build/trans_presets.java:2499 -#, fuzzy +#: build/trans_presets.java:2502 msgid "Edit Travel Agency" -msgstr "Muuda puud" - -#: build/trans_presets.java:2504 +msgstr "" + +#: build/trans_presets.java:2507 msgid "Vending machine" msgstr "" @@ -19489,5 +19816,5 @@ #. item #. -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2509 msgid "Edit Vending machine" msgstr "" @@ -19495,88 +19822,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "Vending products" msgstr "" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_tickets" msgstr "ühistranspordi_piletid" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "public_transport_plans" msgstr "ühistranspordi_plaanid" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "parking_tickets" msgstr "parkimis_pilet" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "food" msgstr "toit" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "drinks" msgstr "joogid" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "sweets" msgstr "maiustused" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "cigarettes" msgstr "suitsud" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "photos" msgstr "fotod" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "animal_food" msgstr "looma_toit" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "news_papers" msgstr "ajalehed" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "toys" msgstr "mänguasjad" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "stamps" msgstr "templid" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "SIM-cards" msgstr "SIM-kaardid" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "telephone_vouchers" msgstr "telefoni_kaardid" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "condoms" msgstr "kondoomid" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "tampons" msgstr "tampoonid" -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2511 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2517 +#: build/trans_presets.java:2520 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2522 msgid "Butcher" msgstr "Lihunik" @@ -19584,9 +19911,9 @@ #. item #. -#: build/trans_presets.java:2521 +#: build/trans_presets.java:2524 msgid "Edit Butcher" msgstr "Vali lihunik" -#: build/trans_presets.java:2526 +#: build/trans_presets.java:2529 msgid "Baker" msgstr "Pagar" @@ -19594,9 +19921,9 @@ #. item #. -#: build/trans_presets.java:2528 +#: build/trans_presets.java:2531 msgid "Edit Baker" msgstr "Vali pagar" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2536 msgid "Florist" msgstr "Lilleseadja" @@ -19604,18 +19931,18 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2538 msgid "Edit Florist" msgstr "Vali lilleseadja" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2543 msgid "Organic" msgstr "Ökokaubad" #. item -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2544 msgid "Edit Organic Shop" msgstr "Redigeeri ökopoodi" -#: build/trans_presets.java:2546 +#: build/trans_presets.java:2549 msgid "Alcohol" msgstr "Alkohol" @@ -19623,54 +19950,54 @@ #. item #. -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2551 msgid "Edit Alcohol Shop" msgstr "Redigeeri alkoholi poode" -#: build/trans_presets.java:2553 +#: build/trans_presets.java:2556 msgid "Beverages" msgstr "Joogipood" #. item -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2557 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2559 +#: build/trans_presets.java:2562 msgid "Computer" msgstr "Arvuti" #. item -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2563 msgid "Edit Computer Shop" msgstr "Vali arvutipood" -#: build/trans_presets.java:2565 +#: build/trans_presets.java:2568 msgid "Electronics" msgstr "Elektroonika" #. item -#: build/trans_presets.java:2566 +#: build/trans_presets.java:2569 msgid "Edit Electronics Shop" msgstr "Vali elektroonika pood" -#: build/trans_presets.java:2571 +#: build/trans_presets.java:2574 msgid "Hifi" msgstr "" #. item -#: build/trans_presets.java:2572 +#: build/trans_presets.java:2575 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2577 +#: build/trans_presets.java:2580 msgid "Furniture" msgstr "Mööbel" #. item -#: build/trans_presets.java:2578 +#: build/trans_presets.java:2581 msgid "Edit Furniture Shop" msgstr "Vali mööblipood" -#: build/trans_presets.java:2583 +#: build/trans_presets.java:2586 msgid "Garden Centre" msgstr "Aiakeskus" @@ -19678,9 +20005,9 @@ #. item #. -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2588 msgid "Edit Garden Centre" msgstr "Vali aiakeskus" -#: build/trans_presets.java:2590 +#: build/trans_presets.java:2593 msgid "Hardware" msgstr "Riistvara" @@ -19688,9 +20015,9 @@ #. item #. -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2595 msgid "Edit Hardware Store" msgstr "Vali riistvara pood" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2600 msgid "Do-it-yourself-store" msgstr "" @@ -19698,54 +20025,54 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2602 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2607 msgid "Stationery" msgstr "Kirjatarbed" #. item -#: build/trans_presets.java:2605 +#: build/trans_presets.java:2608 msgid "Edit Stationery Shop" msgstr "Vali kirjatarvete pood" -#: build/trans_presets.java:2610 +#: build/trans_presets.java:2613 msgid "Hairdresser" msgstr "Juuksur" #. item -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2614 msgid "Edit Hairdresser" msgstr "Vali juuksur" -#: build/trans_presets.java:2616 +#: build/trans_presets.java:2619 msgid "Shoes" msgstr "Jalatsid" #. item -#: build/trans_presets.java:2617 +#: build/trans_presets.java:2620 msgid "Edit Shoe Shop" msgstr "Vali jalatsi pood" -#: build/trans_presets.java:2622 +#: build/trans_presets.java:2625 msgid "Toys" msgstr "Mänguasjad" #. item -#: build/trans_presets.java:2623 +#: build/trans_presets.java:2626 msgid "Edit Toy Shop" msgstr "Vali mänguasja pood" -#: build/trans_presets.java:2628 +#: build/trans_presets.java:2631 msgid "Video" msgstr "Video" #. item -#: build/trans_presets.java:2629 +#: build/trans_presets.java:2632 msgid "Edit Video Shop" msgstr "Vali video pood" -#: build/trans_presets.java:2634 +#: build/trans_presets.java:2637 msgid "Dry Cleaning" msgstr "Kuiir puhastus" @@ -19753,9 +20080,9 @@ #. item #. -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2639 msgid "Edit Dry Cleaning" msgstr "Vali kiirpuhastus" -#: build/trans_presets.java:2641 +#: build/trans_presets.java:2644 msgid "Laundry" msgstr "Pesumaja" @@ -19763,9 +20090,9 @@ #. item #. -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2646 msgid "Edit Laundry" msgstr "Vali pesumaja" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2651 msgid "Outdoor" msgstr "Välisuks" @@ -19773,32 +20100,32 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2653 msgid "Edit Outdoor Shop" msgstr "Vali välisukse pood" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2658 msgid "Sports" msgstr "Sport" #. item -#: build/trans_presets.java:2656 +#: build/trans_presets.java:2659 msgid "Edit Sports Shop" msgstr "Vali spordi pood" -#: build/trans_presets.java:2661 +#: build/trans_presets.java:2664 msgid "Optician" msgstr "Optik" #. item -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2665 msgid "Edit Optician" msgstr "Vali optika" -#: build/trans_presets.java:2669 +#: build/trans_presets.java:2672 msgid "Cash" msgstr "Sularaha" #. group "Cash" -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2673 msgid "Bank" msgstr "Pank" @@ -19806,14 +20133,14 @@ #. item #. -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2675 msgid "Edit Bank" msgstr "Vali Pank" -#: build/trans_presets.java:2677 build/trans_presets.java:2686 +#: build/trans_presets.java:2680 build/trans_presets.java:2689 msgid "Automated Teller Machine" msgstr "Sularaha automaat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2679 +#: build/trans_presets.java:2682 msgid "Money Exchange" msgstr "Raha vahetus" @@ -19821,5 +20148,5 @@ #. item #. -#: build/trans_presets.java:2681 +#: build/trans_presets.java:2684 msgid "Edit Money Exchange" msgstr "Vali rahavahetus punkt" @@ -19827,15 +20154,15 @@ #. item #. -#: build/trans_presets.java:2688 +#: build/trans_presets.java:2691 msgid "Edit Automated Teller Machine" msgstr "Vali sularaha automaat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2696 msgid "Health" msgstr "Tervis" #. group "Health" -#: build/trans_presets.java:2694 +#: build/trans_presets.java:2697 msgid "Doctors" msgstr "Arstid" @@ -19843,18 +20170,18 @@ #. item #. -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2699 msgid "Edit Doctors" msgstr "Vali arstid" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2704 msgid "Dentist" msgstr "Hambaarst" #. item -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2705 msgid "Edit Dentist" msgstr "Vali hambaarst" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2710 msgid "Pharmacy" msgstr "Apteek" @@ -19862,5 +20189,5 @@ #. item #. -#: build/trans_presets.java:2709 +#: build/trans_presets.java:2712 msgid "Edit Pharmacy" msgstr "Vali Apteek" @@ -19868,9 +20195,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2711 +#: build/trans_presets.java:2714 msgid "Dispensing" msgstr "Retseptuur" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2718 msgid "Hospital" msgstr "Haigla" @@ -19878,10 +20205,10 @@ #. item #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2720 msgid "Edit Hospital" msgstr "Vali haigla" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2724 msgid "Emergency Access Point" msgstr "Hädaabi tugijaam" @@ -19890,5 +20217,5 @@ #. -#: build/trans_presets.java:2724 +#: build/trans_presets.java:2727 msgid "Edit Emergency Access Point" msgstr "Vali hädaabi tugijaam" @@ -19897,20 +20224,20 @@ #. #. -#: build/trans_presets.java:2727 +#: build/trans_presets.java:2730 msgid "Point Number" msgstr "Punkti number" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2731 msgid "Point Name" msgstr "Punkti nimi" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2730 +#: build/trans_presets.java:2733 msgid "Phone Number" msgstr "Telefoninumber" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2734 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -19918,5 +20245,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2734 +#: build/trans_presets.java:2737 msgid "Veterinary" msgstr "Loomaarst" @@ -19925,55 +20252,55 @@ #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2740 msgid "Edit Veterinary" msgstr "Vali loomaarst" #. group "Places" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2748 msgid "Continent" msgstr "Kontinent" #. item -#: build/trans_presets.java:2746 +#: build/trans_presets.java:2749 msgid "Edit Continent" msgstr "Vali kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2754 msgid "Country" msgstr "Maa" #. item -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2755 msgid "Edit Country" msgstr "Vali maa" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2757 +#: build/trans_presets.java:2760 msgid "State" msgstr "Riik" #. item -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2761 msgid "Edit State" msgstr "Vali riik" #. item "Places/State" text "Name" -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2766 msgid "Region" msgstr "Regioon" #. item -#: build/trans_presets.java:2764 +#: build/trans_presets.java:2767 msgid "Edit Region" msgstr "Vali regioon" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2769 +#: build/trans_presets.java:2772 msgid "County" msgstr "Maakond" #. item -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2773 msgid "Edit County" msgstr "Vali maakond" @@ -19981,15 +20308,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2779 msgid "City" msgstr "Linn" #. item -#: build/trans_presets.java:2777 +#: build/trans_presets.java:2780 msgid "Edit City" msgstr "Vali linn" #. item "Places/City" text "Name" -#: build/trans_presets.java:2782 +#: build/trans_presets.java:2785 msgid "Town" msgstr "Linn" @@ -19997,10 +20324,10 @@ #. item #. -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2787 msgid "Edit Town" msgstr "Muuda linna" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2792 msgid "Suburb" msgstr "Linnaosa" @@ -20008,25 +20335,25 @@ #. item #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2794 msgid "Edit Suburb" msgstr "Muuda linnaosa" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2796 +#: build/trans_presets.java:2799 msgid "Village" msgstr "Küla/Alevik/Alev" #. item -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2800 msgid "Edit Village" msgstr "Muuda küla/alevik/alev" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2802 +#: build/trans_presets.java:2805 msgid "Hamlet" msgstr "Küla" #. item -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2806 msgid "Edit Hamlet" msgstr "Muuda küla" @@ -20034,5 +20361,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2812 msgid "Locality" msgstr "Asustamata koht" @@ -20040,10 +20367,10 @@ #. item #. -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2814 msgid "Edit Locality" msgstr "Muuda asustamata kohta" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2819 msgid "Island" msgstr "Saar" @@ -20051,24 +20378,22 @@ #. item #. -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2821 msgid "Edit Island" msgstr "Muuda saart" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2823 -#, fuzzy +#: build/trans_presets.java:2826 msgid "Islet" -msgstr "Vasakule" +msgstr "" #. item #. -#: build/trans_presets.java:2825 -#, fuzzy +#: build/trans_presets.java:2828 msgid "Edit Islet" -msgstr "Muuda küla" +msgstr "" #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2834 msgid "Cave Entrance" msgstr "Koobas" @@ -20076,10 +20401,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2836 msgid "Edit Cave Entrance" msgstr "Muuda koobast" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2837 +#: build/trans_presets.java:2840 msgid "Peak" msgstr "Mäetipp" @@ -20087,10 +20412,10 @@ #. item #. -#: build/trans_presets.java:2839 +#: build/trans_presets.java:2842 msgid "Edit Peak" msgstr "Muuda mäetippu" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2844 +#: build/trans_presets.java:2847 msgid "Glacier" msgstr "Liustik" @@ -20098,10 +20423,10 @@ #. item #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2849 msgid "Edit Glacier" msgstr "Muuda liustikku" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2851 +#: build/trans_presets.java:2854 msgid "Volcano" msgstr "Vulkaan" @@ -20109,70 +20434,70 @@ #. item #. -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2856 msgid "Edit Volcano" msgstr "Muuda vulkaani" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2862 msgid "Boundaries" msgstr "Piirid" #. group "Boundaries" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2863 msgid "National" msgstr "Riiklikud" #. item -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2864 msgid "Edit National Boundary" msgstr "Muuda riiklikke piire" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2869 msgid "Administrative" msgstr "Administratiivpiir" #. item -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2870 msgid "Edit Administrative Boundary" msgstr "Muuda administratiivpiire" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2875 msgid "Civil" msgstr "Omavalitsus" #. item -#: build/trans_presets.java:2873 +#: build/trans_presets.java:2876 msgid "Edit Civil Boundary" msgstr "Muuda omavalitsuse piire" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2878 +#: build/trans_presets.java:2881 msgid "Political" msgstr "Valimisringkond" #. item -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2882 msgid "Edit Political Boundary" msgstr "Muuda valimisringkonda" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2884 +#: build/trans_presets.java:2887 msgid "National park" msgstr "Rahvuspark" #. item -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2888 msgid "Edit National Park Boundary" msgstr "Muuda rahvuspargi piire" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2891 +#: build/trans_presets.java:2894 msgid "Land use" msgstr "Maakasutus" #. group "Land use" -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2895 msgid "Tree" msgstr "Üksik puu" @@ -20181,15 +20506,15 @@ #. -#: build/trans_presets.java:2895 +#: build/trans_presets.java:2898 msgid "Edit Tree" msgstr "Muuda puud" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2903 msgid "Botanical Name" msgstr "Botaaniline nimi" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2902 +#: build/trans_presets.java:2905 msgid "Wood" msgstr "Mets" @@ -20198,5 +20523,5 @@ #. -#: build/trans_presets.java:2905 +#: build/trans_presets.java:2908 msgid "Edit Wood" msgstr "Muuda metsa" @@ -20204,17 +20529,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "coniferous" msgstr "okasmets" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "deciduous" msgstr "lehtmets" -#: build/trans_presets.java:2908 build/trans_presets.java:2917 +#: build/trans_presets.java:2911 build/trans_presets.java:2920 msgid "mixed" msgstr "segamets" -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2913 msgid "Forest" msgstr "Kultuurmets" @@ -20223,14 +20548,14 @@ #. -#: build/trans_presets.java:2913 +#: build/trans_presets.java:2916 msgid "Edit Forest Landuse" msgstr "Muuda kultuurmetsa" -#: build/trans_presets.java:2919 +#: build/trans_presets.java:2922 msgid "Nature Reserve" msgstr "Looduskaitseala" #. item -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2923 msgid "Edit Nature Reserve" msgstr "Muuda looduskaitseala" @@ -20238,25 +20563,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2928 msgid "Scree" msgstr "klibu, rusukalle" #. item -#: build/trans_presets.java:2926 +#: build/trans_presets.java:2929 msgid "Edit Scree" msgstr "Muuda rusukallet" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2930 +#: build/trans_presets.java:2933 msgid "Scrub" msgstr "Võsa" #. item -#: build/trans_presets.java:2931 +#: build/trans_presets.java:2934 msgid "Edit Scrub" msgstr "Muuda võsa" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2938 msgid "Fell" msgstr "Langus" @@ -20264,10 +20589,10 @@ #. item #. -#: build/trans_presets.java:2937 +#: build/trans_presets.java:2940 msgid "Edit Fell" msgstr "Muuda langust" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2944 msgid "Heath" msgstr "Nõmm" @@ -20275,5 +20600,5 @@ #. item #. -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2946 msgid "Edit Heath" msgstr "Muuda nõmme" @@ -20281,5 +20606,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2948 +#: build/trans_presets.java:2951 msgid "Farmyard" msgstr "Taluõu" @@ -20288,45 +20613,45 @@ #. -#: build/trans_presets.java:2951 +#: build/trans_presets.java:2954 msgid "Edit Farmyard Landuse" msgstr "Muuda taluõue" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2959 msgid "Farmland" msgstr "Talumaa" #. item -#: build/trans_presets.java:2957 +#: build/trans_presets.java:2960 msgid "Edit Farmland Landuse" msgstr "Muuda talumaad" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2965 msgid "Meadow" msgstr "Niit/Karjamaa" #. item -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2966 msgid "Edit Meadow Landuse" msgstr "Muuta niitu" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2971 msgid "Vineyard" msgstr "Viinapuuistandus" #. item -#: build/trans_presets.java:2969 +#: build/trans_presets.java:2972 msgid "Edit Vineyard Landuse" msgstr "Muuda viinapuuistandust" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2977 msgid "Allotments" msgstr "Eraldised" #. item -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2978 msgid "Edit Allotments Landuse" msgstr "Muuda eraldisi" @@ -20334,25 +20659,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2981 +#: build/trans_presets.java:2984 msgid "Garden" msgstr "Aed" #. item -#: build/trans_presets.java:2982 +#: build/trans_presets.java:2985 msgid "Edit Garden" msgstr "Muuda aeda" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:2986 +#: build/trans_presets.java:2989 msgid "Grass" msgstr "Muru" #. item -#: build/trans_presets.java:2987 +#: build/trans_presets.java:2990 msgid "Edit Grass Landuse" msgstr "Muuda muru" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:2992 +#: build/trans_presets.java:2995 msgid "Village Green" msgstr "Külatanum" @@ -20360,10 +20685,10 @@ #. item #. -#: build/trans_presets.java:2994 +#: build/trans_presets.java:2997 msgid "Edit Village Green Landuse" msgstr "Muuda külatanumat" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:2999 +#: build/trans_presets.java:3002 msgid "Common" msgstr "Avalik maa" @@ -20371,20 +20696,20 @@ #. item #. -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3004 msgid "Edit Common" msgstr "Muuda avalikku maad" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3005 +#: build/trans_presets.java:3008 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:3006 +#: build/trans_presets.java:3009 msgid "Edit Park" msgstr "Muuda parki" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3010 +#: build/trans_presets.java:3013 msgid "Recreation Ground" msgstr "Puhkeala" @@ -20392,5 +20717,5 @@ #. item #. -#: build/trans_presets.java:3012 +#: build/trans_presets.java:3015 msgid "Edit Recreation Ground Landuse" msgstr "Muuda puhkeala" @@ -20398,15 +20723,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3021 msgid "Residential area" msgstr "Elamurajoon" #. item -#: build/trans_presets.java:3019 +#: build/trans_presets.java:3022 msgid "Edit Residential Landuse" msgstr "Muuda elamurajooni" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3027 msgid "Graveyard" msgstr "Matmispaik" @@ -20414,9 +20739,9 @@ #. item #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3029 msgid "Edit Graveyard" msgstr "Muuda matmispaika" -#: build/trans_presets.java:3032 +#: build/trans_presets.java:3035 msgid "Cemetery" msgstr "Kalmistu" @@ -20424,39 +20749,39 @@ #. item #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3037 msgid "Edit Cemetery Landuse" msgstr "Muuda kalmistut" -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3044 msgid "Retail" msgstr "Kaubandus" #. item -#: build/trans_presets.java:3042 +#: build/trans_presets.java:3045 msgid "Edit Retail Landuse" msgstr "Muuda kaubandust" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3050 msgid "Commercial" msgstr "Kommerts" #. item -#: build/trans_presets.java:3048 +#: build/trans_presets.java:3051 msgid "Edit Commercial Landuse" msgstr "Muuda kommertspiirkonda" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3053 +#: build/trans_presets.java:3056 msgid "Industrial" msgstr "Tööstus" #. item -#: build/trans_presets.java:3054 +#: build/trans_presets.java:3057 msgid "Edit Industrial Landuse" msgstr "Muuda tööstuspiirkonda" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3059 +#: build/trans_presets.java:3062 msgid "Railway land" msgstr "Raudtee" @@ -20464,15 +20789,15 @@ #. item #. -#: build/trans_presets.java:3061 +#: build/trans_presets.java:3064 msgid "Edit Railway Landuse" msgstr "Muuda raudteed" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3066 +#: build/trans_presets.java:3069 msgid "Military" msgstr "Militaarala" #. item -#: build/trans_presets.java:3067 +#: build/trans_presets.java:3070 msgid "Edit Military Landuse" msgstr "Muuda militaarala" @@ -20480,55 +20805,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3073 +#: build/trans_presets.java:3076 msgid "Construction area" msgstr "Ehitustanner" #. item -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3077 msgid "Edit Construction Landuse" msgstr "Muuda ehitustandrit" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3079 +#: build/trans_presets.java:3082 msgid "Brownfield" msgstr "Jäätmaa" #. item -#: build/trans_presets.java:3080 +#: build/trans_presets.java:3083 msgid "Edit Brownfield Landuse" msgstr "Muuda jäätmaad" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3085 +#: build/trans_presets.java:3088 msgid "Greenfield" msgstr "Roheala" #. item -#: build/trans_presets.java:3086 +#: build/trans_presets.java:3089 msgid "Edit Greenfield Landuse" msgstr "Muuda roheala" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3091 +#: build/trans_presets.java:3094 msgid "Landfill" msgstr "Prügimägi" #. item -#: build/trans_presets.java:3092 +#: build/trans_presets.java:3095 msgid "Edit Landfill Landuse" msgstr "Muuda prügimäge" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3097 +#: build/trans_presets.java:3100 msgid "Quarry" msgstr "Kivimurd" #. item -#: build/trans_presets.java:3098 +#: build/trans_presets.java:3101 msgid "Edit Quarry Landuse" msgstr "Muuda kivimurdu" #. group "Relations" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3110 msgid "Multipolygon" msgstr "Hulknurk" @@ -20538,5 +20863,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3111 +#: build/trans_presets.java:3114 msgid "Edit Multipolygon" msgstr "Muuda hulknurka" @@ -20545,10 +20870,10 @@ #. #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3120 msgid "outer segment" msgstr "väline osa" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3118 +#: build/trans_presets.java:3121 msgid "inner segment" msgstr "siseosa" @@ -20556,5 +20881,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3121 +#: build/trans_presets.java:3124 msgid "Turn restriction" msgstr "Pöördekeelud" @@ -20563,5 +20888,5 @@ #. -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3127 msgid "Edit Turn Restriction" msgstr "Muuda pöördekeelde" @@ -20569,34 +20894,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "Restriction" msgstr "Keelud" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_left_turn" msgstr "vasakpöörde keeld" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_right_turn" msgstr "parempöörde keeld" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_straight_on" msgstr "ei tohi otse sõita" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "no_u_turn" msgstr "ei tohi tagasi pöörata" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_right_turn" msgstr "ainult parempööre" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_left_turn" msgstr "ainult vaskpööre" -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3129 msgid "only_straight_on" msgstr "ainult otsesõit" @@ -20605,15 +20930,15 @@ #. #. -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3134 msgid "from way" msgstr "teelt" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3135 msgid "via node or way" msgstr "üle sõlme või tee" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3136 msgid "to way" msgstr "teele" @@ -20621,5 +20946,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3139 msgid "Route" msgstr "Teekond" @@ -20628,5 +20953,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3142 msgid "Edit Route" msgstr "Muuda teekonda" @@ -20634,5 +20959,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "Route type" msgstr "teekonna tüüp" @@ -20640,5 +20965,5 @@ #. item "Relations/Route" combo "Route type" #. color destination -#. +#. #. 1 #. 40000 @@ -20704,5 +21029,5 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:233 +#: build/trans_presets.java:3144 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -20711,17 +21036,17 @@ msgstr "jalgrattaga" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "bus" msgstr "buss" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "road" msgstr "tee" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ferry" msgstr "praam" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "ski" msgstr "suusad" @@ -20774,5 +21099,5 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:247 +#: build/trans_presets.java:3144 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -20781,13 +21106,13 @@ msgstr "jalgsi" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "hiking" msgstr "matkamine" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "tram" msgstr "tramm" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3144 msgid "detour" msgstr "ümbersõit" @@ -20801,10 +21126,10 @@ #. #. -#: build/trans_presets.java:3141 build/trans_style.java:1206 +#: build/trans_presets.java:3144 build/trans_style.java:1206 msgid "subway" msgstr "metroo" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3147 msgid "Symbol description" msgstr "sümboolne kirjeldus" @@ -20812,31 +21137,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3150 msgid "Network" msgstr "Võrk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "proposed" msgstr "planeeritud" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "alternate" msgstr "täiendav" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "temporary" msgstr "ajutine" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3152 msgid "connection" msgstr "ühendus" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3153 msgid "Color (hex)" msgstr "Värv (hex)" @@ -20845,30 +21170,30 @@ #. #. -#: build/trans_presets.java:3153 +#: build/trans_presets.java:3156 msgid "route segment" msgstr "teekonna osa" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3157 msgid "forward segment" msgstr "edasisuunaline osa" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3155 +#: build/trans_presets.java:3158 msgid "backward segment" msgstr "tagasisuunaline osa" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3159 msgid "halt point" msgstr "peatuspunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3160 msgid "forward halt point" msgstr "edasisuunaline peatuspunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3158 +#: build/trans_presets.java:3161 msgid "backward halt point" msgstr "tagasisuunaline peatuspunkt" @@ -24021,76 +24346,4 @@ msgstr "alalooline" -#. color historic -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color green -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color green -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color green -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color forest -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color green -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color cemetery -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color green -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/trans_style.java:3055 build/trans_style.java:3063 -#: build/trans_style.java:3071 build/trans_style.java:3079 -#: build/trans_style.java:3127 build/trans_style.java:3135 -#: build/trans_style.java:3233 build/trans_style.java:3241 -msgid "green" -msgstr "roheala" - #. color green #. @@ -25058,9 +25311,187 @@ msgstr "" +#. 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:25 +msgid "Czech CUZK:KM" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:26 +msgid "Czech UHUL:ORTOFOTO" +msgstr "" + +#~ msgid "All the ways were empty" +#~ msgstr "Kõik teed olid tühjad." + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Liida erineva kuuluvusega sõlmed?" + +#~ msgid "Merge Anyway" +#~ msgstr "Liida igal juhul." + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "Valitud sõlmedel on erinevad seosed. Liida need ikkagi?" + +#~ msgid "Unknown version" +#~ msgstr "Tundmatu versioon" + +#~ msgid "Found element in non-way." +#~ msgstr " element võib olla vaid way-s." + +#~ msgid " has zero ref" +#~ msgstr " ei oma ref" + +#~ msgid "Found element in non-relation." +#~ msgstr "Leidub element, mis ei ole seotud" + +#~ msgid "Move" +#~ msgstr "Liiguta" + +#~ msgid "Data Layer" +#~ msgstr "Andmekiht" + +#~ msgid "Unknown file extension." +#~ msgstr "Tundmatu faililaiend." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada." + +#~ msgid "Email" +#~ msgstr "E-post" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Ei suuda avada eelistuste kataloogi: {0}" + +#~ msgid "their version:" +#~ msgstr "nende versioon:" + +#~ msgid "my version:" +#~ msgstr "minu versioon:" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "OSM username (email)" +#~ msgstr "OSM kasutajanimi (email)" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Server andis sisemise vea. Vähendage pindala või proovige mõne aja pärast " +#~ "uuesti ." + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Jätan tee vahele kuna see sisaldab mitte eksisteerivat : {0}\n" + #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "Vihje: Mõned muudatused tulid uute andmete üleslaadimisest." +#~ msgid "Aborting..." +#~ msgstr "Katkestan..." + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Saad kasutada hiirt või Ctrl+Nooleklahvid/./ et suurendada ja lohistada" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Sildid (tühi väärtus kustutab sildi)" + +#~ msgid "Occupied By" +#~ msgstr "Kasutab" + +#~ msgid "Remove Selected" +#~ msgstr "Eemalda valitud" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Lisa kõik hetkel valitud objektid liikmetena" + +#~ msgid "Add Selected" +#~ msgstr "Lisa valitud" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Vajuta \"Lae uuesti\" et nimekirja uuendada" + +#~ msgid "Cannot connect to server." +#~ msgstr "Ei saa serveriga ühenduda." + +#~ msgid "Error parsing server response." +#~ msgstr "Viga serveri vastuse töötlemisel." + +#~ msgid "There were conflicts during import." +#~ msgstr "Importimisel tekkisid konfliktid." + +#~ msgid "Basic" +#~ msgstr "Lihtne" + +#~ msgid "Revert" +#~ msgstr "Taasta" + +#~ msgid "Date" +#~ msgstr "Kuupäev" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Taasta kõigi hetkel valitud objektide olek ajaloo nimekirjas valitud " +#~ "versiooniks." + +#~ msgid "Authors: {0}" +#~ msgstr "Autorid: {0}" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Konfliktid: {0}" + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Plugin {0} paistab olevat vigane või seda ei saa automaatselt alla " +#~ "laadida." + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Mõned sõlmed on enam-vähem ühel joonel." + +#~ msgid "Helppage missing. Create it in english." +#~ msgstr "Abileht puudub. Loo see english." + +#~ msgid "" +#~ "Helppage missing. Create it in english or your language." +#~ msgstr "" +#~ "Abileht puudub. Loo see english või eesti" + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Palun vali vali vähemalt üks sõlm või tee või seos. Ainult juba üles " +#~ "laetud elementidel on ajalugu." + +#~ msgid "unnamed" +#~ msgstr "Nimetu" + #~ msgid "Please select ways with almost right angles to orthogonalize." #~ msgstr "Palun vali peaaegu täisnurga all kohtuvad teed." + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME parandatud)" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" #~ msgid "" @@ -25071,151 +25502,4 @@ #~ "teata sellest veast arendajaid." -#~ msgid "No document open so nothing to save." -#~ msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada." - -#~ msgid "Delete {1} {0}" -#~ msgstr "Kustuta {1} {0}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Ei suuda avada eelistuste kataloogi: {0}" - -#~ msgid "Authors: {0}" -#~ msgstr "Autorid: {0}" - -#~ msgid "Move" -#~ msgstr "Liiguta" - -#~ msgid "Data Layer" -#~ msgstr "Andmekiht" - -#~ msgid "Unknown file extension." -#~ msgstr "Tundmatu faililaiend." - -#~ msgid "Email" -#~ msgstr "E-post" - -#~ msgid "their version:" -#~ msgstr "nende versioon:" - -#~ msgid "my version:" -#~ msgstr "minu versioon:" - -#~ msgid "Object" -#~ msgstr "Objekt" - -#~ msgid "OSM username (email)" -#~ msgstr "OSM kasutajanimi (email)" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Server andis sisemise vea. Vähendage pindala või proovige mõne aja pärast " -#~ "uuesti ." - -#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -#~ msgstr "Jätan tee vahele kuna see sisaldab mitte eksisteerivat : {0}\n" - -#~ msgid "Aborting..." -#~ msgstr "Katkestan..." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Saad kasutada hiirt või Ctrl+Nooleklahvid/./ et suurendada ja lohistada" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Sildid (tühi väärtus kustutab sildi)" - -#~ msgid "Occupied By" -#~ msgstr "Kasutab" - -#~ msgid "Remove Selected" -#~ msgstr "Eemalda valitud" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Lisa kõik hetkel valitud objektid liikmetena" - -#~ msgid "Add Selected" -#~ msgstr "Lisa valitud" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Vajuta \"Lae uuesti\" et nimekirja uuendada" - -#~ msgid "Cannot connect to server." -#~ msgstr "Ei saa serveriga ühenduda." - -#~ msgid "Error parsing server response." -#~ msgstr "Viga serveri vastuse töötlemisel." - -#~ msgid "There were conflicts during import." -#~ msgstr "Importimisel tekkisid konfliktid." - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Eemalda hetkel valitud tabelirea liige sellest seosest" - -#~ msgid "Basic" -#~ msgstr "Lihtne" - -#~ msgid "Revert" -#~ msgstr "Taasta" - -#~ msgid "Date" -#~ msgstr "Kuupäev" - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "Taasta kõigi hetkel valitud objektide olek ajaloo nimekirjas valitud " -#~ "versiooniks." - -#~ msgid "Conflicts: {0}" -#~ msgstr "Konfliktid: {0}" - -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "" -#~ "Plugin {0} paistab olevat vigane või seda ei saa automaatselt alla " -#~ "laadida." - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Mõned sõlmed on enam-vähem ühel joonel." - -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "Abileht puudub. Loo see english." - -#~ msgid "" -#~ "Helppage missing. Create it in english or your language." -#~ msgstr "" -#~ "Abileht puudub. Loo see english või eesti" - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "Palun vali vali vähemalt üks sõlm või tee või seos. Ainult juba üles " -#~ "laetud elementidel on ajalugu." - -#~ msgid "unnamed" -#~ msgstr "Nimetu" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME parandatud)" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}" @@ -25239,4 +25523,7 @@ #~ msgstr "Muuda" +#~ msgid "Delete {1} {0}" +#~ msgstr "Kustuta {1} {0}" + #~ msgid "Failed to initialize API. Please try again later." #~ msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti."